Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a56036fa872d
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8e478c234100
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on Oct 16, 2019

  1. Add experimental-features setting 

    Experimental features are now opt-in. There are currently two
experimental features: "nix-command" (which enables the "nix"
command), and "flakes" (which enables support for flakes). This will
allow us to merge experimental features more quickly, without
committing to supporting them indefinitely.

Typical usage:

$ nix build --experimental-features 'nix-command flakes' nixpkgs#hello
    @edolstra
    edolstra committed Oct 16, 2019
    Copy the full SHA
    8e478c2 View commit details
Showing with 17 additions and 0 deletions.
  1. +2 −0 src/libexpr/flake/flake.cc
  2. +7 −0 src/libstore/globals.cc
  3. +5 −0 src/libstore/globals.hh
  4. +2 −0 src/nix/main.cc
  5. +1 −0 tests/init.sh
2 changes: 2 additions & 0 deletions src/libexpr/flake/flake.cc
View file
Original file line number Diff line number Diff line change
@@ -433,6 +433,8 @@ static std::pair<Flake, LockedInput> updateLocks(
and optionally write it to file, it the flake is writable. */
ResolvedFlake resolveFlake(EvalState & state, const FlakeRef & topRef, HandleLockFile handleLockFile)
{
settings.requireExperimentalFeature("flakes");

auto flake = getFlake(state, topRef,
allowedToUseRegistries(handleLockFile, true));

7 changes: 7 additions & 0 deletions src/libstore/globals.cc
View file
Original file line number Diff line number Diff line change
@@ -105,6 +105,13 @@ StringSet Settings::getDefaultSystemFeatures()
return features;
}

void Settings::requireExperimentalFeature(const std::string & name)
{
auto & f = experimentalFeatures.get();
if (std::find(f.begin(), f.end(), name) == f.end())
throw Error("experimental Nix feature '%s' is disabled", name);
}

const string nixVersion = PACKAGE_VERSION;

template<> void BaseSetting<SandboxMode>::set(const std::string & str)
5 changes: 5 additions & 0 deletions src/libstore/globals.hh
View file
Original file line number Diff line number Diff line change
@@ -356,6 +356,11 @@ public:

Setting<std::string> githubAccessToken{this, "", "github-acces-token",
"GitHub access token to get access to GitHub data through the GitHub API for github:<..> flakes."};

Setting<Strings> experimentalFeatures{this, {}, "experimental-features",
"Experimental Nix features to enable."};

void requireExperimentalFeature(const std::string & name);
};


2 changes: 2 additions & 0 deletions src/nix/main.cc
View file
Original file line number Diff line number Diff line change
@@ -149,6 +149,8 @@ void mainWrapped(int argc, char * * argv)

args.parseCmdline(argvToStrings(argc, argv));

settings.requireExperimentalFeature("nix-command");

initPlugins();

if (!args.command) args.showHelpAndExit();
1 change: 1 addition & 0 deletions tests/init.sh
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ cat > "$NIX_CONF_DIR"/nix.conf <<EOF
build-users-group =
keep-derivations = false
sandbox = false
experimental-features = nix-command flakes
include nix.conf.extra
EOF