Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 24e9ec31665a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de21c43257d4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 24, 2017

  1. tiled: 0.18.2 -> 1.0.1

    @dywedir
    dywedir committed Jun 24, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    33e4afa View commit details

Commits on Jun 25, 2017

  1. Merge pull request #26829 from dywedir/tiled 

    tiled: 0.18.2 -> 1.0.1
    @Mic92
    Mic92 authored Jun 25, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    de21c43 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/editors/tiled/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/editors/tiled/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@ let
# qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
in stdenv.mkDerivation rec {
name = "tiled-${version}";
version = "0.18.2";
version = "1.0.1";

src = fetchFromGitHub {
owner = "bjorn";
repo = "tiled";
rev = "v${version}";
sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2";
sha256 = "062ja3j84v5s4qslp01gqif8c6i1klkkxpxyyrrvjhxmbyn6nmgd";
};

nativeBuildInputs = [ pkgconfig qmake ];