diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-06-05 11:06:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-06-05 11:06:44 +0200 |
| commit | 576af1718704f9eca5db0983a94edcf8d06caddd (patch) | |
| tree | 5abaed9414b2de580360f7fe1e1add62bff81dd5 /pkgs/development/tools/misc | |
| parent | c4724fb7bcc83a778632ce096e37b7dcdd3b034b (diff) | |
| parent | e283999204ef8b7c3c3e10e93da82bf39f06d1fa (diff) | |
| download | nixlib-576af1718704f9eca5db0983a94edcf8d06caddd.tar nixlib-576af1718704f9eca5db0983a94edcf8d06caddd.tar.gz nixlib-576af1718704f9eca5db0983a94edcf8d06caddd.tar.bz2 nixlib-576af1718704f9eca5db0983a94edcf8d06caddd.tar.lz nixlib-576af1718704f9eca5db0983a94edcf8d06caddd.tar.xz nixlib-576af1718704f9eca5db0983a94edcf8d06caddd.tar.zst nixlib-576af1718704f9eca5db0983a94edcf8d06caddd.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1523575
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/gede/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 3099bc38dc20..70a157bc0840 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gede-${version}"; - version = "2.13.1"; + version = "2.14.1"; src = fetchurl { url = "http://gede.acidron.com/uploads/source/${name}.tar.xz"; - sha256 = "00qgp45hgcnmv8qj0vicqmiwa82rzyadcqy48xfxjd4xgf0qy5bk"; + sha256 = "1z7577zwz7h03d58as93hyx99isi3p4i3rhxr8l01zgi65mz0mr9"; }; nativeBuildInputs = [ qmake makeWrapper python ]; diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 198da09e1d06..d9f481425b62 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -4,7 +4,7 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "teto"; repo = "luarocks"; - rev = "ca52159dcb544161e5bef1e4e366f3da31fa4555"; - sha256 = "13g7vpyirq51qmmnjsqhhiia9wdnq9aw4da0n3r7l1ar95q168sn"; + rev = "595456f1246d66e5bdce0de838d0d6188274991c"; + sha256 = "14nn0n5a0m516lnbwljy85h7y98zwnfbcyz7hgsm6fn4p8316yz2"; }; }) |