diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-05-12 00:50:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-12 00:50:10 +0000 |
| commit | 5a513ae14b7cb0bf0c76398c5cd663f435ba52e9 (patch) | |
| tree | 01cc41da207d8ba446291b090379ec5d413f80ba /pkgs/tools/package-management | |
| parent | ec9708143759dcbd723188a246b609c9388d3d4e (diff) | |
| parent | 9c19ef7cf2a4af99d13a1744a53d223edfc002f0 (diff) | |
| download | nixlib-5a513ae14b7cb0bf0c76398c5cd663f435ba52e9.tar nixlib-5a513ae14b7cb0bf0c76398c5cd663f435ba52e9.tar.gz nixlib-5a513ae14b7cb0bf0c76398c5cd663f435ba52e9.tar.bz2 nixlib-5a513ae14b7cb0bf0c76398c5cd663f435ba52e9.tar.lz nixlib-5a513ae14b7cb0bf0c76398c5cd663f435ba52e9.tar.xz nixlib-5a513ae14b7cb0bf0c76398c5cd663f435ba52e9.tar.zst nixlib-5a513ae14b7cb0bf0c76398c5cd663f435ba52e9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/enable-all-experimental.patch | 14 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/enable-flakes.patch | 14 |
3 files changed, 35 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4dfdb7075a5b..a16e74819a63 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -227,6 +227,12 @@ in rec { inherit storeDir stateDir confDir boehmgc; }); - nixFlakes = nixUnstable; + nixExperimental = nixUnstable.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ ./enable-all-experimental.patch ]; + }); + + nixFlakes = nixUnstable.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ ./enable-flakes.patch ]; + }); } diff --git a/pkgs/tools/package-management/nix/enable-all-experimental.patch b/pkgs/tools/package-management/nix/enable-all-experimental.patch new file mode 100644 index 000000000000..1712b7295a5e --- /dev/null +++ b/pkgs/tools/package-management/nix/enable-all-experimental.patch @@ -0,0 +1,14 @@ +diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc +index d3b27d7be..e7d002e1d 100644 +--- a/src/libstore/globals.cc ++++ b/src/libstore/globals.cc +@@ -172,8 +172,7 @@ MissingExperimentalFeature::MissingExperimentalFeature(std::string feature) + + void Settings::requireExperimentalFeature(const std::string & name) + { +- if (!isExperimentalFeatureEnabled(name)) +- throw MissingExperimentalFeature(name); ++ return; + } + + bool Settings::isWSL1() diff --git a/pkgs/tools/package-management/nix/enable-flakes.patch b/pkgs/tools/package-management/nix/enable-flakes.patch new file mode 100644 index 000000000000..998067449b7f --- /dev/null +++ b/pkgs/tools/package-management/nix/enable-flakes.patch @@ -0,0 +1,14 @@ +diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh +index 3e4ead76c..81d407236 100644 +--- a/src/libstore/globals.hh ++++ b/src/libstore/globals.hh +@@ -923,7 +923,8 @@ public: + value. + )"}; + +- Setting<Strings> experimentalFeatures{this, {}, "experimental-features", ++ Setting<Strings> experimentalFeatures{ ++ this, {"flakes", "nix-command"}, "experimental-features", + "Experimental Nix features to enable."}; + + bool isExperimentalFeatureEnabled(const std::string & name); |