diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/package-management/nix/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/package-management/nix/default.nix | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index 868be79c1a49..c980fda3c861 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -1,16 +1,17 @@ -{ lib, fetchurl, fetchpatch, fetchFromGitHub, callPackage +{ lib, fetchurl, fetchFromGitHub, fetchpatch, callPackage , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" , boehmgc +, Security }: let common = - { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz + { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz , bash, coreutils, gzip, gnutar - , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json + , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex , jq, libarchive , lowdown, mdbook @@ -23,8 +24,8 @@ common = , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , enableStatic ? stdenv.hostPlatform.isStatic - , name, suffix ? "", src, patches ? [] - + , name, suffix ? "", src + , patches ? [ ] }: let sh = busybox-sandbox-shell; @@ -39,12 +40,12 @@ common = outputs = [ "out" "dev" "man" "doc" ]; nativeBuildInputs = - [ pkgconfig ] + [ pkg-config ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex - lowdown mdbook + (lib.getBin lowdown) mdbook jq ]; @@ -52,18 +53,18 @@ common = [ curl openssl sqlite xz bzip2 nlohmann_json brotli boost editline ] + ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive gmock ] + ++ lib.optionals is24 [ libarchive gmock lowdown ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { apis = ["s3" "transfer"]; customMemoryManagement = false; }).overrideDerivation (args: { - patches = args.patches or [] ++ [(fetchpatch { - url = "https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch"; - sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; - })]; + patches = args.patches or [] ++ [ + ./aws-sdk-cpp-TransferManager-ContentEncoding.patch + ]; })); propagatedBuildInputs = [ boehmgc ]; @@ -125,7 +126,7 @@ common = ] ++ lib.optional ( stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform ? nix && stdenv.hostPlatform.nix ? system - ) ''--with-system=${stdenv.hostPlatform.nix.system}'' + ) "--with-system=${stdenv.hostPlatform.nix.system}" # RISC-V support in progress https://github.com/seccomp/libseccomp/pull/50 ++ lib.optional (!withLibseccomp) "--disable-seccomp-sandboxing"; @@ -155,9 +156,9 @@ common = environments. ''; homepage = "https://nixos.org/"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.unix; + license = lib.licenses.lgpl2Plus; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.unix; outputsToInstall = [ "out" "man" ]; }; @@ -173,7 +174,7 @@ common = # This is not cross-compile safe, don't have time to fix right now # but noting for future travellers. nativeBuildInputs = - [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ]; + [ perl pkg-config curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ]; configureFlags = [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" @@ -199,18 +200,25 @@ in rec { sha256 = "a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab"; }; + patches = [( + fetchpatch { + url = "https://github.com/NixOS/nix/pull/4316.patch"; + sha256 = "0bqlm4n9sac9prgr9xlfng92arisp1hiqvc9pfh4fibsppkgdfc5"; + } + )]; + inherit storeDir stateDir confDir boehmgc; }); nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20201201_5a6ddb3"; + suffix = "pre20201205_a5d85d0"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5a6ddb3de14a1684af6c793d663764d093fa7846"; - sha256 = "0qhd3nxvqzszzsfvh89xhd239ycqb0kq2n0bzh9br78pcb60vj3g"; + rev = "a5d85d07faa94cf3518e98273be4bee3d495f06a"; + sha256 = "0g9jjhh0vs4hjrff5yx88x6sh7rk87ngvni3gnyxajqia957dipg"; }; patches = [ |