diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/games/cutemaze | |
parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/games/cutemaze')
-rw-r--r-- | pkgs/games/cutemaze/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 756436c1ffc2..24077697218d 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, qmake, qttools, qtsvg }: +{ stdenv, fetchurl, qmake, qttools, qtsvg, mkDerivation }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "cutemaze"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2"; - sha256 = "0l727j28igs7cx6gvxs43vvzhp3hk0z61df7sprp1vdxzpzzfifl"; + sha256 = "1xrjv3h1bpbji1dl9hkcvmp6qk4j618saffl41455vhrzn170lrj"; }; nativeBuildInputs = [ qmake qttools ]; |