diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-24 15:02:29 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-24 15:02:29 +0100 |
commit | ef935fa1016ba6209a8882f4ccd776c5272a4359 (patch) | |
tree | 8d4c66fda8f30dc3bb2a1c5ce5da5b7fca999dd8 /pkgs/tools/package-management | |
parent | d5d15828b51a7d4fd7eee82c6e9a1b261aa49115 (diff) | |
parent | dd3eea4b476552cbdf95388179bfdd668d04b8b7 (diff) | |
download | nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.gz nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.bz2 nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.lz nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.xz nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.tar.zst nixlib-ef935fa1016ba6209a8882f4ccd776c5272a4359.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/cde/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-review/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index 17150c75466e..e45906688ada 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -33,5 +33,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.rlupton20 ]; platforms = platforms.linux; + # error: architecture aarch64 is not supported by strace + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix index 0409df7906c7..5481182fbd1d 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nix-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-review"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-review"; rev = version; - sha256 = "18z7dws3ngx0ffqqgybq65xxsiycildd101q58sj51z1k3lnrynh"; + sha256 = "0vgar8sb2471zipxa1cw0n90mrnn5da7wqdlxhamnkrylbh0mc0d"; }; makeWrapperArgs = [ |