diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-18 16:56:39 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-18 16:56:39 -0500 |
| commit | bbfc9ce376d425db075a3a97c5b1363e2826acbe (patch) | |
| tree | 5a8864ff7dd8a988358bb7d9ff9e2df147956c00 /pkgs/tools | |
| parent | d8c2bac68c33788064bfb9be99c7337670f3f8a3 (diff) | |
| parent | a96886863a0616f528b4cfe17faf182cb29d3a03 (diff) | |
| download | nixlib-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar nixlib-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar.gz nixlib-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar.bz2 nixlib-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar.lz nixlib-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar.xz nixlib-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar.zst nixlib-bbfc9ce376d425db075a3a97c5b1363e2826acbe.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 21b333f32316..f6e6988270ad 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -30,7 +30,7 @@ let buildInputs = [ curl openssl sqlite xz bzip2 ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optionals fromGit [ brotli ] # Since 1.12 - ++ lib.optional stdenv.isLinux libseccomp + ++ lib.optional (stdenv.isLinux && !hostPlatform.isRiscV) libseccomp ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) (aws-sdk-cpp.override { apis = ["s3"]; @@ -55,7 +55,9 @@ let ] ++ lib.optional ( hostPlatform != buildPlatform && hostPlatform ? nix && hostPlatform.nix ? system - ) ''--with-system=${hostPlatform.nix.system}''; + ) ''--with-system=${hostPlatform.nix.system}'' + # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 + ++ lib.optional hostPlatform.isRiscV "--disable-seccomp-sandboxing"; makeFlags = "profiledir=$(out)/etc/profile.d"; @@ -124,12 +126,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-2.0${suffix}"; - suffix = "pre5950_3a5a241b"; + suffix = "pre5951_690ac7c9"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "3a5a241b3209f14f8801b902ba20b5cb0666c9df"; - sha256 = "0cwjyhgyfzi2dz561nj897zhkbyx6lzi49avcyia2pr4498jcl6k"; + rev = "690ac7c90b5bf3c599e210c53365c7d229c8b0ff"; + sha256 = "1yn2p38kp1i67makbawr1rhdiwihgnvk2zwrz0gvf6q65mj2k89c"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; |