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: e20ee8a710f3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d5c6f5fd038c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 13, 2019

  1. tiled: 1.2.2 -> 1.2.3

    @dywedir
    dywedir committed Mar 13, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: BE743C5DD7703515
    Verified
    Learn about vigilant mode
    Copy the full SHA
    92ea2c2 View commit details

Commits on Mar 14, 2019

  1. Merge pull request #57612 from dywedir/tiled 

    tiled: 1.2.2 -> 1.2.3
    @ryantm
    ryantm authored Mar 14, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d5c6f5f View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/applications/editors/tiled/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/editors/tiled/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@
, python, qtbase, qttools }:

stdenv.mkDerivation rec {
name = "tiled-${version}";
version = "1.2.2";
pname = "tiled";
version = "1.2.3";

src = fetchFromGitHub {
owner = "bjorn";
repo = "tiled";
repo = pname;
rev = "v${version}";
sha256 = "1yqw10izqhsnqwgxvws2n4ymcwawbh86srv7qmjwbsay752pfgfh";
sha256 = "1zsfhw539zwyf5qfnirzkkgy5bmrrs2cry4gimrhpky9fjlaa9h8";
};

nativeBuildInputs = [ pkgconfig qmake ];