diff options
| author | DavHau <hsngrmpf+github@gmail.com> | 2021-05-04 18:15:27 +0700 |
|---|---|---|
| committer | DavHau <hsngrmpf+github@gmail.com> | 2021-05-04 18:15:27 +0700 |
| commit | 88658813192ae0348aa307d592ac2d52398ba669 (patch) | |
| tree | 64ebfb284586ab21d256b5789287aeaed9d6f912 /pkgs/tools/package-management | |
| parent | f94876e77b7de2bfd0960cd53fedf7bac7d998d1 (diff) | |
| download | nixlib-88658813192ae0348aa307d592ac2d52398ba669.tar nixlib-88658813192ae0348aa307d592ac2d52398ba669.tar.gz nixlib-88658813192ae0348aa307d592ac2d52398ba669.tar.bz2 nixlib-88658813192ae0348aa307d592ac2d52398ba669.tar.lz nixlib-88658813192ae0348aa307d592ac2d52398ba669.tar.xz nixlib-88658813192ae0348aa307d592ac2d52398ba669.tar.zst nixlib-88658813192ae0348aa307d592ac2d52398ba669.zip | |
nixExperimental: init
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/enable-all-experimental.patch | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index fa088e04fe54..a8dd048be021 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -227,6 +227,10 @@ in rec { inherit storeDir stateDir confDir boehmgc; }); + 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() |