diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 984f9a9ea..a5005f8a0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,36 +1,54 @@
---
name: Bug report
-about: Create a report to help us improve
+about: Report unexpected or incorrect behaviour
title: ''
labels: bug
assignees: ''
---
-**Describe the bug**
+## Describe the bug
-A clear and concise description of what the bug is.
+
-**Steps To Reproduce**
+## Steps To Reproduce
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+
-A clear and concise description of what you expected to happen.
+## Expected behavior
-**`nix-env --version` output**
+
-**Additional context**
+## Metadata
-Add any other context about the problem here.
+
-**Priorities**
+## Additional context
+
+
+
+## Checklist
+
+
+
+- [ ] checked [latest Nix manual] \([source])
+- [ ] checked [open bug issues and pull requests] for possible duplicates
+
+[latest Nix manual]: https://nixos.org/manual/nix/unstable/
+[source]: https://github.com/NixOS/nix/tree/master/doc/manual/source
+[open bug issues and pull requests]: https://github.com/NixOS/nix/labels/bug
+
+---
Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 42c658b52..c75a46951 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,24 +1,39 @@
---
name: Feature request
-about: Suggest an idea for this project
+about: Suggest a new feature
title: ''
labels: feature
assignees: ''
---
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## Is your feature request related to a problem?
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+## Proposed solution
-**Additional context**
-Add any other context or screenshots about the feature request here.
+
-**Priorities**
+## Alternative solutions
+
+
+
+## Additional context
+
+
+
+## Checklist
+
+
+
+- [ ] checked [latest Nix manual] \([source])
+- [ ] checked [open feature issues and pull requests] for possible duplicates
+
+[latest Nix manual]: https://nixos.org/manual/nix/unstable/
+[source]: https://github.com/NixOS/nix/tree/master/doc/manual/source
+[open feature issues and pull requests]: https://github.com/NixOS/nix/labels/feature
+
+---
Add :+1: to [issues you find important](https://github.com/NixOS/nix/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc).
diff --git a/.github/ISSUE_TEMPLATE/installer.md b/.github/ISSUE_TEMPLATE/installer.md
index 3768a49c9..ed5e1ce87 100644
--- a/.github/ISSUE_TEMPLATE/installer.md
+++ b/.github/ISSUE_TEMPLATE/installer.md
@@ -23,14 +23,25 @@ assignees: ''
Output
-```log
+
-
+```log
```
[&rev='. */
+/**
+ * Check if `url` is a flake ID. This is an abbreviated syntax for
+ * `flake:?ref=][&rev=`.
+ */
static std::optional> parseFlakeIdRef(
const fetchers::Settings & fetchSettings,
const std::string & url,
@@ -227,22 +241,11 @@ std::optional> parseURLFlakeRef(
bool isFlake
)
{
- ParsedURL parsedURL;
try {
- parsedURL = parseURL(url);
+ return fromParsedURL(fetchSettings, parseURL(url), isFlake);
} catch (BadURL &) {
return std::nullopt;
}
-
- std::string fragment;
- std::swap(fragment, parsedURL.fragment);
-
- auto input = fetchers::Input::fromURL(fetchSettings, parsedURL, isFlake);
- input.parent = baseDir;
-
- return std::make_pair(
- FlakeRef(std::move(input), getOr(parsedURL.query, "dir", "")),
- fragment);
}
std::pair parseFlakeRefWithFragment(
@@ -254,8 +257,6 @@ std::pair parseFlakeRefWithFragment(
{
using namespace fetchers;
- std::smatch match;
-
if (auto res = parseFlakeIdRef(fetchSettings, url, isFlake)) {
return *res;
} else if (auto res = parseURLFlakeRef(fetchSettings, url, baseDir, isFlake)) {
diff --git a/src/libflake/meson.build b/src/libflake/meson.build
index d2bb179df..2c1a70a18 100644
--- a/src/libflake/meson.build
+++ b/src/libflake/meson.build
@@ -26,8 +26,6 @@ deps_public_maybe_subproject = [
]
subdir('build-utils-meson/subprojects')
-subdir('build-utils-meson/threads')
-
nlohmann_json = dependency('nlohmann_json', version : '>= 3.9')
deps_public += nlohmann_json
@@ -41,7 +39,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'flake/config.cc',
diff --git a/src/libmain-c/meson.build b/src/libmain-c/meson.build
index 0ec0e3f6d..3cb1e4baa 100644
--- a/src/libmain-c/meson.build
+++ b/src/libmain-c/meson.build
@@ -29,8 +29,6 @@ deps_public_maybe_subproject = [
]
subdir('build-utils-meson/subprojects')
-subdir('build-utils-meson/threads')
-
# TODO rename, because it will conflict with downstream projects
configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
@@ -55,7 +53,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'nix_api_main.cc',
diff --git a/src/libmain/meson.build b/src/libmain/meson.build
index 7fcadf06d..6c6298e2b 100644
--- a/src/libmain/meson.build
+++ b/src/libmain/meson.build
@@ -26,8 +26,6 @@ deps_public_maybe_subproject = [
]
subdir('build-utils-meson/subprojects')
-subdir('build-utils-meson/threads')
-
pubsetbuf_test = '''
#include
@@ -60,7 +58,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'common-args.cc',
diff --git a/src/libstore-c/meson.build b/src/libstore-c/meson.build
index d4f86eeff..44b5fe11d 100644
--- a/src/libstore-c/meson.build
+++ b/src/libstore-c/meson.build
@@ -27,8 +27,6 @@ deps_public_maybe_subproject = [
]
subdir('build-utils-meson/subprojects')
-subdir('build-utils-meson/threads')
-
# TODO rename, because it will conflict with downstream projects
configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
@@ -51,7 +49,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'nix_api_store.cc',
diff --git a/src/libstore-test-support/meson.build b/src/libstore-test-support/meson.build
index 98ec9882e..1f230914f 100644
--- a/src/libstore-test-support/meson.build
+++ b/src/libstore-test-support/meson.build
@@ -22,11 +22,10 @@ deps_public_maybe_subproject = [
dependency('nix-util'),
dependency('nix-util-test-support'),
dependency('nix-store'),
+ dependency('nix-store-c'),
]
subdir('build-utils-meson/subprojects')
-subdir('build-utils-meson/threads')
-
rapidcheck = dependency('rapidcheck')
deps_public += rapidcheck
@@ -38,7 +37,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'tests/derived-path.cc',
diff --git a/src/libstore-test-support/package.nix b/src/libstore-test-support/package.nix
index 48f8b5e6b..2543049fe 100644
--- a/src/libstore-test-support/package.nix
+++ b/src/libstore-test-support/package.nix
@@ -4,6 +4,7 @@
, nix-util-test-support
, nix-store
+, nix-store-c
, rapidcheck
@@ -35,6 +36,7 @@ mkMesonLibrary (finalAttrs: {
propagatedBuildInputs = [
nix-util-test-support
nix-store
+ nix-store-c
rapidcheck
];
diff --git a/src/libstore-tests/meson.build b/src/libstore-tests/meson.build
index f4f67d73a..fc9152f2f 100644
--- a/src/libstore-tests/meson.build
+++ b/src/libstore-tests/meson.build
@@ -25,8 +25,6 @@ deps_public_maybe_subproject = [
]
subdir('build-utils-meson/subprojects')
-subdir('build-utils-meson/threads')
-
subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
@@ -52,7 +50,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'common-protocol.cc',
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
index 34ed16a38..bf1a25db1 100644
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@@ -991,7 +991,10 @@ Goal::Co DerivationGoal::buildDone()
auto nixLogCommand = experimentalFeatureSettings.isEnabled(Xp::NixCommand)
? "nix log"
: "nix-store -l";
- msg += fmt("For full logs, run '" ANSI_BOLD "%s %s" ANSI_NORMAL "'.",
+ // The command is on a separate line for easy copying, such as with triple click.
+ // This message will be indented elsewhere, so removing the indentation before the
+ // command will not put it at the start of the line unfortunately.
+ msg += fmt("For full logs, run:\n " ANSI_BOLD "%s %s" ANSI_NORMAL,
nixLogCommand,
worker.store.printStorePath(drvPath));
}
@@ -1226,7 +1229,7 @@ HookReply DerivationGoal::tryBuildHook()
hook->toHook.writeSide.close();
/* Create the log file and pipe. */
- Path logFile = openLogFile();
+ [[maybe_unused]] Path logFile = openLogFile();
std::set fds;
fds.insert(hook->fromHook.readSide.get());
diff --git a/src/libstore/build/drv-output-substitution-goal.cc b/src/libstore/build/drv-output-substitution-goal.cc
index dedcad2b1..f069c0d94 100644
--- a/src/libstore/build/drv-output-substitution-goal.cc
+++ b/src/libstore/build/drv-output-substitution-goal.cc
@@ -32,7 +32,7 @@ Goal::Co DrvOutputSubstitutionGoal::init()
bool substituterFailed = false;
- for (auto sub : subs) {
+ for (const auto & sub : subs) {
trace("trying next substituter");
/* The callback of the curl download below can outlive `this` (if
diff --git a/src/libstore/build/substitution-goal.cc b/src/libstore/build/substitution-goal.cc
index 315500719..983c86601 100644
--- a/src/libstore/build/substitution-goal.cc
+++ b/src/libstore/build/substitution-goal.cc
@@ -57,7 +57,7 @@ Goal::Co PathSubstitutionGoal::init()
bool substituterFailed = false;
- for (auto sub : subs) {
+ for (const auto & sub : subs) {
trace("trying next substituter");
cleanup();
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 9b6f67852..1f37b0c38 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -1017,29 +1017,31 @@ std::string hashPlaceholder(const OutputNameView outputName)
return "/" + hashString(HashAlgorithm::SHA256, concatStrings("nix-output:", outputName)).to_string(HashFormat::Nix32, false);
}
-
-
-
-static void rewriteDerivation(Store & store, BasicDerivation & drv, const StringMap & rewrites)
+void BasicDerivation::applyRewrites(const StringMap & rewrites)
{
- debug("Rewriting the derivation");
+ if (rewrites.empty()) return;
- for (auto & rewrite : rewrites) {
+ debug("rewriting the derivation");
+
+ for (auto & rewrite : rewrites)
debug("rewriting %s as %s", rewrite.first, rewrite.second);
- }
- drv.builder = rewriteStrings(drv.builder, rewrites);
- for (auto & arg : drv.args) {
+ builder = rewriteStrings(builder, rewrites);
+ for (auto & arg : args)
arg = rewriteStrings(arg, rewrites);
- }
StringPairs newEnv;
- for (auto & envVar : drv.env) {
+ for (auto & envVar : env) {
auto envName = rewriteStrings(envVar.first, rewrites);
auto envValue = rewriteStrings(envVar.second, rewrites);
newEnv.emplace(envName, envValue);
}
- drv.env = newEnv;
+ env = std::move(newEnv);
+}
+
+static void rewriteDerivation(Store & store, BasicDerivation & drv, const StringMap & rewrites)
+{
+ drv.applyRewrites(rewrites);
auto hashModulo = hashDerivationModulo(store, Derivation(drv), true);
for (auto & [outputName, output] : drv.outputs) {
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 40740d545..765b66ade 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -325,6 +325,12 @@ struct BasicDerivation
static std::string_view nameFromPath(const StorePath & storePath);
+ /**
+ * Apply string rewrites to the `env`, `args` and `builder`
+ * fields.
+ */
+ void applyRewrites(const StringMap & rewrites);
+
bool operator == (const BasicDerivation &) const = default;
// TODO libc++ 16 (used by darwin) missing `std::map::operator <=>`, can't do yet.
//auto operator <=> (const BasicDerivation &) const = default;
diff --git a/src/libstore/export-import.cc b/src/libstore/export-import.cc
index cb36c0c1b..1c62cdfad 100644
--- a/src/libstore/export-import.cc
+++ b/src/libstore/export-import.cc
@@ -13,14 +13,9 @@ void Store::exportPaths(const StorePathSet & paths, Sink & sink)
auto sorted = topoSortPaths(paths);
std::reverse(sorted.begin(), sorted.end());
- std::string doneLabel("paths exported");
- //logger->incExpected(doneLabel, sorted.size());
-
for (auto & path : sorted) {
- //Activity act(*logger, lvlInfo, "exporting path '%s'", path);
sink << 1;
exportPath(path, sink);
- //logger->incProgress(doneLabel);
}
sink << 0;
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index 73195794a..45dfe4ad8 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -4,6 +4,7 @@
#include "finally.hh"
#include "unix-domain-socket.hh"
#include "signals.hh"
+#include "posix-fs-canonicalise.hh"
#if !defined(__linux__)
// For shelling out to lsof
@@ -763,13 +764,18 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
}
}
}
-
for (auto & path : topoSortPaths(visited)) {
if (!dead.insert(path).second) continue;
if (shouldDelete) {
- invalidatePathChecked(path);
- deleteFromStore(path.to_string());
- referrersCache.erase(path);
+ try {
+ invalidatePathChecked(path);
+ deleteFromStore(path.to_string());
+ referrersCache.erase(path);
+ } catch (PathInUse &e) {
+ // If we end up here, it's likely a new occurence
+ // of https://github.com/NixOS/nix/issues/11923
+ printError("BUG: %s", e.what());
+ }
}
}
};
diff --git a/src/libstore/keys.cc b/src/libstore/keys.cc
index 70478e7ad..668725fc7 100644
--- a/src/libstore/keys.cc
+++ b/src/libstore/keys.cc
@@ -10,12 +10,12 @@ PublicKeys getDefaultPublicKeys()
// FIXME: filter duplicates
- for (auto s : settings.trustedPublicKeys.get()) {
+ for (const auto & s : settings.trustedPublicKeys.get()) {
PublicKey key(s);
publicKeys.emplace(key.name, key);
}
- for (auto secretKeyFile : settings.secretKeyFiles.get()) {
+ for (const auto & secretKeyFile : settings.secretKeyFiles.get()) {
try {
SecretKey secretKey(readFile(secretKeyFile));
publicKeys.emplace(secretKey.name, secretKey.toPublicKey());
diff --git a/src/libstore/local-overlay-store.cc b/src/libstore/local-overlay-store.cc
index b86beba2c..56ff6bef3 100644
--- a/src/libstore/local-overlay-store.cc
+++ b/src/libstore/local-overlay-store.cc
@@ -156,7 +156,7 @@ void LocalOverlayStore::queryGCReferrers(const StorePath & path, StorePathSet &
StorePathSet LocalOverlayStore::queryValidDerivers(const StorePath & path)
{
auto res = LocalStore::queryValidDerivers(path);
- for (auto p : lowerStore->queryValidDerivers(path))
+ for (const auto & p : lowerStore->queryValidDerivers(path))
res.insert(p);
return res;
}
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index eafdac0cd..f708bd1b0 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -95,51 +95,6 @@ struct LocalStore::State::Stmts {
SQLiteStmt AddRealisationReference;
};
-static int getSchema(Path schemaPath)
-{
- int curSchema = 0;
- if (pathExists(schemaPath)) {
- auto s = readFile(schemaPath);
- auto n = string2Int(s);
- if (!n)
- throw Error("'%1%' is corrupt", schemaPath);
- curSchema = *n;
- }
- return curSchema;
-}
-
-void migrateCASchema(SQLite& db, Path schemaPath, AutoCloseFD& lockFd)
-{
- const int nixCASchemaVersion = 4;
- int curCASchema = getSchema(schemaPath);
- if (curCASchema != nixCASchemaVersion) {
- if (curCASchema > nixCASchemaVersion) {
- throw Error("current Nix store ca-schema is version %1%, but I only support %2%",
- curCASchema, nixCASchemaVersion);
- }
-
- if (!lockFile(lockFd.get(), ltWrite, false)) {
- printInfo("waiting for exclusive access to the Nix store for ca drvs...");
- lockFile(lockFd.get(), ltNone, false); // We have acquired a shared lock; release it to prevent deadlocks
- lockFile(lockFd.get(), ltWrite, true);
- }
-
- if (curCASchema == 0) {
- static const char schema[] =
- #include "ca-specific-schema.sql.gen.hh"
- ;
- db.exec(schema);
- curCASchema = nixCASchemaVersion;
- }
-
- if (curCASchema < 4)
- throw Error("experimental CA schema version %d is no longer supported", curCASchema);
-
- writeFile(schemaPath, fmt("%d", nixCASchemaVersion), 0666, true);
- lockFile(lockFd.get(), ltRead, true);
- }
-}
-
LocalStore::LocalStore(
std::string_view scheme,
PathView path,
@@ -316,6 +271,10 @@ LocalStore::LocalStore(
openDB(*state, false);
+ /* Legacy database schema migrations. Don't bump 'schema' for
+ new migrations; instead, add a migration to
+ upgradeDBSchema(). */
+
if (curSchema < 8) {
SQLiteTxn txn(state->db);
state->db.exec("alter table ValidPaths add column ultimate integer");
@@ -342,13 +301,7 @@ LocalStore::LocalStore(
else openDB(*state, false);
- if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations)) {
- if (!readOnly) {
- migrateCASchema(state->db, dbDir + "/ca-schema", globalLock);
- } else {
- throw Error("need to migrate to content-addressed schema, but this cannot be done in read-only mode");
- }
- }
+ upgradeDBSchema(*state);
/* Prepare SQL statements. */
state->stmts->RegisterValidPath.create(state->db,
@@ -483,7 +436,17 @@ std::string LocalStore::getUri()
int LocalStore::getSchema()
-{ return nix::getSchema(schemaPath); }
+{
+ int curSchema = 0;
+ if (pathExists(schemaPath)) {
+ auto s = readFile(schemaPath);
+ auto n = string2Int(s);
+ if (!n)
+ throw Error("'%1%' is corrupt", schemaPath);
+ curSchema = *n;
+ }
+ return curSchema;
+}
void LocalStore::openDB(State & state, bool create)
{
@@ -566,6 +529,42 @@ void LocalStore::openDB(State & state, bool create)
}
+void LocalStore::upgradeDBSchema(State & state)
+{
+ state.db.exec("create table if not exists SchemaMigrations (migration text primary key not null);");
+
+ std::set schemaMigrations;
+
+ {
+ SQLiteStmt querySchemaMigrations;
+ querySchemaMigrations.create(state.db, "select migration from SchemaMigrations;");
+ auto useQuerySchemaMigrations(querySchemaMigrations.use());
+ while (useQuerySchemaMigrations.next())
+ schemaMigrations.insert(useQuerySchemaMigrations.getStr(0));
+ }
+
+ auto doUpgrade = [&](const std::string & migrationName, const std::string & stmt)
+ {
+ if (schemaMigrations.contains(migrationName))
+ return;
+
+ debug("executing Nix database schema migration '%s'...", migrationName);
+
+ SQLiteTxn txn(state.db);
+ state.db.exec(stmt + fmt(";\ninsert into SchemaMigrations values('%s')", migrationName));
+ txn.commit();
+
+ schemaMigrations.insert(migrationName);
+ };
+
+ if (experimentalFeatureSettings.isEnabled(Xp::CaDerivations))
+ doUpgrade(
+ "20220326-ca-derivations",
+ #include "ca-specific-schema.sql.gen.hh"
+ );
+}
+
+
/* To improve purity, users may want to make the Nix store a read-only
bind mount. So make the Nix store writable for this process. */
void LocalStore::makeStoreWritable()
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 21848cc4d..83154d651 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -356,6 +356,8 @@ private:
void openDB(State & state, bool create);
+ void upgradeDBSchema(State & state);
+
void makeStoreWritable();
uint64_t queryValidPathId(State & state, const StorePath & path);
diff --git a/src/libstore/meson.build b/src/libstore/meson.build
index 101879e90..f836b8d4f 100644
--- a/src/libstore/meson.build
+++ b/src/libstore/meson.build
@@ -82,7 +82,6 @@ if host_machine.system() == 'windows'
endif
subdir('build-utils-meson/libatomic')
-subdir('build-utils-meson/threads')
boost = dependency(
'boost',
@@ -180,7 +179,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'binary-cache-store.cc',
diff --git a/src/libstore/nar-info.cc b/src/libstore/nar-info.cc
index 8b2557060..27fcc2864 100644
--- a/src/libstore/nar-info.cc
+++ b/src/libstore/nar-info.cc
@@ -118,7 +118,7 @@ std::string NarInfo::to_string(const Store & store) const
if (deriver)
res += "Deriver: " + std::string(deriver->to_string()) + "\n";
- for (auto sig : sigs)
+ for (const auto & sig : sigs)
res += "Sig: " + sig + "\n";
if (ca)
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index bcbf0b55e..bf351a56d 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -454,7 +454,7 @@ struct S3BinaryCacheStoreImpl : virtual S3BinaryCacheStoreConfig, public virtual
debug("got %d keys, next marker '%s'",
contents.size(), res.GetNextMarker());
- for (auto object : contents) {
+ for (const auto & object : contents) {
auto & key = object.GetKey();
if (key.size() != 40 || !hasSuffix(key, ".narinfo")) continue;
paths.insert(parseStorePath(storeDir + "/" + key.substr(0, key.size() - 8) + "-" + MissingName));
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 10577fa2a..78cc3b917 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -1332,7 +1332,7 @@ ref openStore(StoreReference && storeURI)
return std::make_shared(params);
},
[&](const StoreReference::Specified & g) {
- for (auto implem : *Implementations::registered)
+ for (const auto & implem : *Implementations::registered)
if (implem.uriSchemes.count(g.scheme))
return implem.create(g.scheme, g.authority, params);
@@ -1363,7 +1363,7 @@ std::list> getDefaultSubstituters()
}
};
- for (auto uri : settings.substituters.get())
+ for (const auto & uri : settings.substituters.get())
addStore(uri);
stores.sort([](ref & a, ref & b) {
diff --git a/src/libstore/unix/build/local-derivation-goal.cc b/src/libstore/unix/build/local-derivation-goal.cc
index dcfaadeef..06a2f85be 100644
--- a/src/libstore/unix/build/local-derivation-goal.cc
+++ b/src/libstore/unix/build/local-derivation-goal.cc
@@ -883,7 +883,7 @@ void LocalDerivationGoal::startBuilder()
printMsg(lvlVomit, "setting builder env variable '%1%'='%2%'", i.first, i.second);
/* Create the log file. */
- Path logFile = openLogFile();
+ [[maybe_unused]] Path logFile = openLogFile();
/* Create a pseudoterminal to get the output of the builder. */
builderOut = posix_openpt(O_RDWR | O_NOCTTY);
diff --git a/src/libutil-c/meson.build b/src/libutil-c/meson.build
index 3d5a0b9c2..d44453676 100644
--- a/src/libutil-c/meson.build
+++ b/src/libutil-c/meson.build
@@ -25,8 +25,6 @@ deps_public_maybe_subproject = [
]
subdir('build-utils-meson/subprojects')
-subdir('build-utils-meson/threads')
-
# TODO rename, because it will conflict with downstream projects
configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
@@ -47,7 +45,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'nix_api_util.cc',
diff --git a/src/libutil-test-support/meson.build b/src/libutil-test-support/meson.build
index c5e1ba80b..4afed01ca 100644
--- a/src/libutil-test-support/meson.build
+++ b/src/libutil-test-support/meson.build
@@ -20,11 +20,10 @@ deps_private_maybe_subproject = [
]
deps_public_maybe_subproject = [
dependency('nix-util'),
+ dependency('nix-util-c'),
]
subdir('build-utils-meson/subprojects')
-subdir('build-utils-meson/threads')
-
rapidcheck = dependency('rapidcheck')
deps_public += rapidcheck
@@ -35,7 +34,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'tests/hash.cc',
diff --git a/src/libutil-test-support/package.nix b/src/libutil-test-support/package.nix
index 2525e1602..c403e762c 100644
--- a/src/libutil-test-support/package.nix
+++ b/src/libutil-test-support/package.nix
@@ -3,6 +3,7 @@
, mkMesonLibrary
, nix-util
+, nix-util-c
, rapidcheck
@@ -33,6 +34,7 @@ mkMesonLibrary (finalAttrs: {
propagatedBuildInputs = [
nix-util
+ nix-util-c
rapidcheck
];
diff --git a/src/libutil-test-support/tests/gtest-with-params.hh b/src/libutil-test-support/tests/gtest-with-params.hh
index d72aec4fd..a6e23ad89 100644
--- a/src/libutil-test-support/tests/gtest-with-params.hh
+++ b/src/libutil-test-support/tests/gtest-with-params.hh
@@ -40,7 +40,7 @@ void checkGTestWith(Testable && testable, MakeTestParams makeTestParams)
} else {
std::ostringstream ss;
printResultMessage(result, ss);
- FAIL() << ss.str() << std::endl;
+ throw std::runtime_error(ss.str());
}
}
}
diff --git a/src/libutil-test-support/tests/nix_api_util.hh b/src/libutil-test-support/tests/nix_api_util.hh
index efd200116..006dc497c 100644
--- a/src/libutil-test-support/tests/nix_api_util.hh
+++ b/src/libutil-test-support/tests/nix_api_util.hh
@@ -26,14 +26,13 @@ protected:
inline void assert_ctx_ok()
{
-
if (nix_err_code(ctx) == NIX_OK) {
return;
}
unsigned int n;
const char * p = nix_err_msg(nullptr, ctx, &n);
std::string msg(p, n);
- FAIL() << "nix_err_code(ctx) != NIX_OK, message: " << msg;
+ throw std::runtime_error(std::string("nix_err_code(ctx) != NIX_OK, message: ") + msg);
}
inline void assert_ctx_err()
@@ -41,7 +40,7 @@ protected:
if (nix_err_code(ctx) != NIX_OK) {
return;
}
- FAIL() << "Got NIX_OK, but expected an error!";
+ throw std::runtime_error("Got NIX_OK, but expected an error!");
}
};
diff --git a/src/libutil-tests/hilite.cc b/src/libutil-tests/hilite.cc
index 1ff5980d5..5ef581888 100644
--- a/src/libutil-tests/hilite.cc
+++ b/src/libutil-tests/hilite.cc
@@ -52,8 +52,7 @@ namespace nix {
std::regex("pt"),
};
std::vector matches;
- for(auto regex : regexes)
- {
+ for (const auto & regex : regexes) {
for(auto it = std::sregex_iterator(str.begin(), str.end(), regex); it != std::sregex_iterator(); ++it) {
matches.push_back(*it);
}
diff --git a/src/libutil-tests/meson.build b/src/libutil-tests/meson.build
index 5c3b5e5a3..f59350774 100644
--- a/src/libutil-tests/meson.build
+++ b/src/libutil-tests/meson.build
@@ -25,8 +25,6 @@ deps_public_maybe_subproject = [
]
subdir('build-utils-meson/subprojects')
-subdir('build-utils-meson/threads')
-
subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
@@ -44,7 +42,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'args.cc',
diff --git a/src/libutil-tests/nix_api_util.cc b/src/libutil-tests/nix_api_util.cc
index b36f71042..7b77bd87f 100644
--- a/src/libutil-tests/nix_api_util.cc
+++ b/src/libutil-tests/nix_api_util.cc
@@ -136,7 +136,6 @@ TEST_F(nix_api_util_context, nix_err_name)
// no error
EXPECT_THROW(nix_err_name(NULL, ctx, OBSERVE_STRING(err_name)), nix::Error);
- std::string err_msg_ref;
try {
throw nix::Error("testing error");
} catch (...) {
diff --git a/src/libutil/args.cc b/src/libutil/args.cc
index 385b6cd34..05ecf724e 100644
--- a/src/libutil/args.cc
+++ b/src/libutil/args.cc
@@ -348,7 +348,7 @@ void RootArgs::parseCmdline(const Strings & _cmdline, bool allowShebang)
/* Now that all the other args are processed, run the deferred completions.
*/
- for (auto d : deferredCompletions)
+ for (const auto & d : deferredCompletions)
d.completer(*completions, d.n, d.prefix);
}
diff --git a/src/libutil/config.hh b/src/libutil/config.hh
index c0c59ac68..e98e09bf7 100644
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -115,6 +115,8 @@ public:
* Re-applies all previously attempted changes to unknown settings
*/
void reapplyUnknownSettings();
+
+ virtual ~AbstractConfig() = default;
};
/**
diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
index 92996ea47..829700336 100644
--- a/src/libutil/file-system.cc
+++ b/src/libutil/file-system.cc
@@ -602,7 +602,11 @@ std::pair createTempFile(const Path & prefix)
void createSymlink(const Path & target, const Path & link)
{
- fs::create_symlink(target, link);
+ try {
+ fs::create_symlink(target, link);
+ } catch (fs::filesystem_error & e) {
+ throw SysError("creating symlink '%1%' -> '%2%'", link, target);
+ }
}
void replaceSymlink(const fs::path & target, const fs::path & link)
@@ -615,10 +619,16 @@ void replaceSymlink(const fs::path & target, const fs::path & link)
fs::create_symlink(target, tmp);
} catch (fs::filesystem_error & e) {
if (e.code() == std::errc::file_exists) continue;
- throw;
+ throw SysError("creating symlink '%1%' -> '%2%'", tmp, target);
+ }
+
+ try {
+ fs::rename(tmp, link);
+ } catch (fs::filesystem_error & e) {
+ if (e.code() == std::errc::file_exists) continue;
+ throw SysError("renaming '%1%' to '%2%'", tmp, link);
}
- fs::rename(tmp, link);
break;
}
diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh
index 4c08cdf58..3c49181a0 100644
--- a/src/libutil/file-system.hh
+++ b/src/libutil/file-system.hh
@@ -250,8 +250,6 @@ void setWriteTime(const std::filesystem::path & path, const struct stat & st);
/**
* Create a symlink.
*
- * In the process of being deprecated for
- * `std::filesystem::create_symlink`.
*/
void createSymlink(const Path & target, const Path & link);
diff --git a/src/libutil/meson.build b/src/libutil/meson.build
index a6dc86394..11b4ea592 100644
--- a/src/libutil/meson.build
+++ b/src/libutil/meson.build
@@ -54,7 +54,6 @@ endforeach
configdata.set('HAVE_DECL_AT_SYMLINK_NOFOLLOW', cxx.has_header_symbol('fcntl.h', 'AT_SYMLINK_NOFOLLOW').to_int())
subdir('build-utils-meson/libatomic')
-subdir('build-utils-meson/threads')
if host_machine.system() == 'windows'
socket = cxx.find_library('ws2_32')
@@ -121,7 +120,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
sources = files(
'archive.cc',
diff --git a/src/libutil/serialise.cc b/src/libutil/serialise.cc
index 168d2ed32..381e7ae38 100644
--- a/src/libutil/serialise.cc
+++ b/src/libutil/serialise.cc
@@ -90,7 +90,6 @@ void Source::operator () (std::string_view data)
void Source::drainInto(Sink & sink)
{
- std::string s;
std::array buf;
while (true) {
size_t n;
@@ -427,7 +426,7 @@ Error readError(Source & source)
auto type = readString(source);
assert(type == "Error");
auto level = (Verbosity) readInt(source);
- auto name = readString(source); // removed
+ [[maybe_unused]] auto name = readString(source); // removed
auto msg = readString(source);
ErrorInfo info {
.level = level,
diff --git a/src/libutil/source-accessor.cc b/src/libutil/source-accessor.cc
index e797951c7..d3e304f74 100644
--- a/src/libutil/source-accessor.cc
+++ b/src/libutil/source-accessor.cc
@@ -84,9 +84,10 @@ CanonPath SourceAccessor::resolveSymlinks(
todo.pop_front();
if (c == "" || c == ".")
;
- else if (c == "..")
- res.pop();
- else {
+ else if (c == "..") {
+ if (!res.isRoot())
+ res.pop();
+ } else {
res.push(c);
if (mode == SymlinkResolution::Full || !todo.empty()) {
if (auto st = maybeLstat(res); st && st->type == SourceAccessor::tSymlink) {
diff --git a/src/libutil/terminal.cc b/src/libutil/terminal.cc
index db7a6fcd1..4c127ddb0 100644
--- a/src/libutil/terminal.cc
+++ b/src/libutil/terminal.cc
@@ -26,7 +26,7 @@ bool isTTY()
std::string filterANSIEscapes(std::string_view s, bool filterAll, unsigned int width)
{
- std::string t, e;
+ std::string t;
size_t w = 0;
auto i = s.begin();
diff --git a/src/libutil/url.cc b/src/libutil/url.cc
index 9ed49dcbe..63b9734ee 100644
--- a/src/libutil/url.cc
+++ b/src/libutil/url.cc
@@ -77,7 +77,7 @@ std::map decodeQuery(const std::string & query)
{
std::map result;
- for (auto s : tokenizeString(query, "&")) {
+ for (const auto & s : tokenizeString(query, "&")) {
auto e = s.find('=');
if (e == std::string::npos) {
warn("dubious URI query '%s' is missing equal sign '%s', ignoring", s, "=");
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index c394836da..de01e1afc 100644
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -340,13 +340,15 @@ static void main_nix_build(int argc, char * * argv)
exprs = {state->parseStdin()};
else
for (auto i : remainingArgs) {
- auto baseDir = inShebang && !packages ? absPath(dirOf(script)) : i;
-
- if (fromArgs)
+ if (fromArgs) {
+ auto shebangBaseDir = absPath(dirOf(script));
exprs.push_back(state->parseExprFromString(
std::move(i),
- (inShebang && compatibilitySettings.nixShellShebangArgumentsRelativeToScript) ? lookupFileArg(*state, baseDir) : state->rootPath(".")
+ (inShebang && compatibilitySettings.nixShellShebangArgumentsRelativeToScript)
+ ? lookupFileArg(*state, shebangBaseDir)
+ : state->rootPath(".")
));
+ }
else {
auto absolute = i;
try {
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index ba2baccee..e9eb52708 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -481,12 +481,13 @@ static void printMissing(EvalState & state, PackageInfos & elems)
{
std::vector targets;
for (auto & i : elems)
- if (auto drvPath = i.queryDrvPath())
- targets.emplace_back(DerivedPath::Built{
+ if (auto drvPath = i.queryDrvPath()) {
+ auto path = DerivedPath::Built{
.drvPath = makeConstantStorePathRef(*drvPath),
.outputs = OutputsSpec::All { },
- });
- else
+ };
+ targets.emplace_back(std::move(path));
+ } else
targets.emplace_back(DerivedPath::Opaque{
.path = i.queryOutPath(),
});
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index c823c930e..b731b25af 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -222,7 +222,7 @@ static void opPrintFixedPath(Strings opFlags, Strings opArgs)
{
auto method = FileIngestionMethod::Flat;
- for (auto i : opFlags)
+ for (const auto & i : opFlags)
if (i == "--recursive") method = FileIngestionMethod::NixArchive;
else throw UsageError("unknown flag '%1%'", i);
diff --git a/src/nix/build.cc b/src/nix/build.cc
index da9132d02..3569b0cde 100644
--- a/src/nix/build.cc
+++ b/src/nix/build.cc
@@ -42,29 +42,6 @@ static nlohmann::json builtPathsWithResultToJSON(const std::vector& buildables, LocalFSStore& store2)
-{
- for (const auto & [_i, buildable] : enumerate(buildables)) {
- auto i = _i;
- std::visit(overloaded {
- [&](const BuiltPath::Opaque & bo) {
- auto symlink = outLink;
- if (i) symlink += fmt("-%d", i);
- store2.addPermRoot(bo.path, absPath(symlink.string()));
- },
- [&](const BuiltPath::Built & bfd) {
- for (auto & output : bfd.outputs) {
- auto symlink = outLink;
- if (i) symlink += fmt("-%d", i);
- if (output.first != "out") symlink += fmt("-%s", output.first);
- store2.addPermRoot(output.second, absPath(symlink.string()));
- }
- },
- }, buildable.path.raw());
- }
-}
-
struct CmdBuild : InstallablesCommand, MixDryRun, MixJSON, MixProfile
{
Path outLink = "result";
@@ -140,7 +117,7 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixJSON, MixProfile
if (outLink != "")
if (auto store2 = store.dynamic_pointer_cast())
- createOutLinks(outLink, buildables, *store2);
+ createOutLinks(outLink, toBuiltPaths(buildables), *store2);
if (printOutputPaths) {
stopProgressBar();
diff --git a/src/nix/copy.cc b/src/nix/copy.cc
index 151d28277..399a6c0fd 100644
--- a/src/nix/copy.cc
+++ b/src/nix/copy.cc
@@ -1,11 +1,13 @@
#include "command.hh"
#include "shared.hh"
#include "store-api.hh"
+#include "local-fs-store.hh"
using namespace nix;
-struct CmdCopy : virtual CopyCommand, virtual BuiltPathsCommand
+struct CmdCopy : virtual CopyCommand, virtual BuiltPathsCommand, MixProfile
{
+ std::optional outLink;
CheckSigsFlag checkSigs = CheckSigs;
SubstituteFlag substitute = NoSubstitute;
@@ -13,6 +15,15 @@ struct CmdCopy : virtual CopyCommand, virtual BuiltPathsCommand
CmdCopy()
: BuiltPathsCommand(true)
{
+ addFlag({
+ .longName = "out-link",
+ .shortName = 'o',
+ .description = "Create symlinks prefixed with *path* to the top-level store paths fetched from the source store.",
+ .labels = {"path"},
+ .handler = {&outLink},
+ .completer = completePath
+ });
+
addFlag({
.longName = "no-check-sigs",
.description = "Do not require that paths are signed by trusted keys.",
@@ -43,19 +54,28 @@ struct CmdCopy : virtual CopyCommand, virtual BuiltPathsCommand
Category category() override { return catSecondary; }
- void run(ref srcStore, BuiltPaths && paths) override
+ void run(ref srcStore, BuiltPaths && allPaths, BuiltPaths && rootPaths) override
{
auto dstStore = getDstStore();
RealisedPath::Set stuffToCopy;
- for (auto & builtPath : paths) {
+ for (auto & builtPath : allPaths) {
auto theseRealisations = builtPath.toRealisedPaths(*srcStore);
stuffToCopy.insert(theseRealisations.begin(), theseRealisations.end());
}
copyPaths(
*srcStore, *dstStore, stuffToCopy, NoRepair, checkSigs, substitute);
+
+ updateProfile(rootPaths);
+
+ if (outLink) {
+ if (auto store2 = dstStore.dynamic_pointer_cast())
+ createOutLinks(*outLink, rootPaths, *store2);
+ else
+ throw Error("'--out-link' is not supported for this Nix store");
+ }
}
};
diff --git a/src/nix/copy.md b/src/nix/copy.md
index 6ab7cdee3..813050fcb 100644
--- a/src/nix/copy.md
+++ b/src/nix/copy.md
@@ -55,6 +55,15 @@ R""(
# nix copy --to /tmp/nix nixpkgs#hello --no-check-sigs
```
+* Update the NixOS system profile to point to a closure copied from a
+ remote machine:
+
+ ```console
+ # nix copy --from ssh://server \
+ --profile /nix/var/nix/profiles/system \
+ /nix/store/r14v3km89zm3prwsa521fab5kgzvfbw4-nixos-system-foobar-24.05.20240925.759537f
+ ```
+
# Description
`nix copy` copies store path closures between two Nix stores. The
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 9a95bc695..1736add9a 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -611,7 +611,7 @@ struct CmdDevelop : Common, MixEnvironment
else if (!command.empty()) {
std::vector args;
args.reserve(command.size());
- for (auto s : command)
+ for (const auto & s : command)
args.push_back(shellEscape(s));
script += fmt("exec %s\n", concatStringsSep(" ", args));
}
diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index 3a54763a1..9f3584a11 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -94,7 +94,7 @@ public:
.label="inputs",
.optional=true,
.handler={[&](std::vector inputsToUpdate){
- for (auto inputToUpdate : inputsToUpdate) {
+ for (const auto & inputToUpdate : inputsToUpdate) {
InputPath inputPath;
try {
inputPath = flake::parseInputPath(inputToUpdate);
@@ -643,10 +643,11 @@ struct CmdFlakeCheck : FlakeCommand
fmt("%s.%s.%s", name, attr_name, state->symbols[attr2.name]),
*attr2.value, attr2.pos);
if (drvPath && attr_name == settings.thisSystem.get()) {
- drvPaths.push_back(DerivedPath::Built {
+ auto path = DerivedPath::Built {
.drvPath = makeConstantStorePathRef(*drvPath),
.outputs = OutputsSpec::All { },
- });
+ };
+ drvPaths.push_back(std::move(path));
}
}
}
@@ -891,37 +892,32 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
auto cursor = installable.getCursor(*evalState);
- auto templateDirAttr = cursor->getAttr("path");
- auto templateDir = templateDirAttr->getString();
-
- if (!store->isInStore(templateDir))
- evalState->error(
- "'%s' was not found in the Nix store\n"
- "If you've set '%s' to a string, try using a path instead.",
- templateDir, templateDirAttr->getAttrPathStr()).debugThrow();
+ auto templateDirAttr = cursor->getAttr("path")->forceValue();
+ NixStringContext context;
+ auto templateDir = evalState->coerceToPath(noPos, templateDirAttr, context, "");
std::vector changedFiles;
std::vector conflictedFiles;
- std::function copyDir;
- copyDir = [&](const fs::path & from, const fs::path & to)
+ std::function copyDir;
+ copyDir = [&](const SourcePath & from, const fs::path & to)
{
fs::create_directories(to);
- for (auto & entry : fs::directory_iterator{from}) {
+ for (auto & [name, entry] : from.readDirectory()) {
checkInterrupt();
- auto from2 = entry.path();
- auto to2 = to / entry.path().filename();
- auto st = entry.symlink_status();
+ auto from2 = from / name;
+ auto to2 = to / name;
+ auto st = from2.lstat();
auto to_st = fs::symlink_status(to2);
- if (fs::is_directory(st))
+ if (st.type == SourceAccessor::tDirectory)
copyDir(from2, to2);
- else if (fs::is_regular_file(st)) {
- auto contents = readFile(from2.string());
+ else if (st.type == SourceAccessor::tRegular) {
+ auto contents = from2.readFile();
if (fs::exists(to_st)) {
auto contents2 = readFile(to2.string());
if (contents != contents2) {
- printError("refusing to overwrite existing file '%s'\n please merge it manually with '%s'", to2.string(), from2.string());
+ printError("refusing to overwrite existing file '%s'\n please merge it manually with '%s'", to2.string(), from2);
conflictedFiles.push_back(to2);
} else {
notice("skipping identical file: %s", from2);
@@ -930,18 +926,18 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
} else
writeFile(to2, contents);
}
- else if (fs::is_symlink(st)) {
- auto target = fs::read_symlink(from2);
+ else if (st.type == SourceAccessor::tSymlink) {
+ auto target = from2.readLink();
if (fs::exists(to_st)) {
if (fs::read_symlink(to2) != target) {
- printError("refusing to overwrite existing file '%s'\n please merge it manually with '%s'", to2.string(), from2.string());
+ printError("refusing to overwrite existing file '%s'\n please merge it manually with '%s'", to2.string(), from2);
conflictedFiles.push_back(to2);
} else {
notice("skipping identical file: %s", from2);
}
continue;
} else
- fs::create_symlink(target, to2);
+ createSymlink(target, to2);
}
else
throw Error("file '%s' has unsupported type", from2);
@@ -957,14 +953,14 @@ struct CmdFlakeInitCommon : virtual Args, EvalCommand
for (auto & s : changedFiles) args.emplace_back(s.string());
runProgram("git", true, args);
}
- auto welcomeText = cursor->maybeGetAttr("welcomeText");
- if (welcomeText) {
+
+ if (auto welcomeText = cursor->maybeGetAttr("welcomeText")) {
notice("\n");
notice(renderMarkdownToTerminal(welcomeText->getString()));
}
if (!conflictedFiles.empty())
- throw Error("Encountered %d conflicts - see above", conflictedFiles.size());
+ throw Error("encountered %d conflicts - see above", conflictedFiles.size());
}
};
diff --git a/src/nix/flake.md b/src/nix/flake.md
index a9b703762..1e9895f6e 100644
--- a/src/nix/flake.md
+++ b/src/nix/flake.md
@@ -84,6 +84,8 @@ Here are some examples of flake references in their URL-like representation:
repository on GitHub.
* `github:NixOS/nixpkgs/nixos-20.09`: The `nixos-20.09` branch of the
`nixpkgs` repository.
+* `github:NixOS/nixpkgs/pull/357207/head`: The `357207` pull request
+ of the nixpkgs repository.
* `github:NixOS/nixpkgs/a3a3dda3bacf61e8a39258a0ed9c924eeca8e293`: A
specific revision of the `nixpkgs` repository.
* `github:edolstra/nix-warez?dir=blender`: A flake in a subdirectory
@@ -243,6 +245,9 @@ Currently the `type` attribute can be one of the following:
* `./sub/dir` (when used on the command line and `dir/flake.nix` is in a git repository)
* `git+https://example.org/my/repo`
* `git+https://example.org/my/repo?dir=flake1`
+ * `git+https://example.org/my/repo?shallow=1` A shallow clone of the repository.
+ For large repositories, the shallow clone option can significantly speed up fresh clones compared
+ to non-shallow clones, while still providing faster updates than other fetch methods such as `tarball:` or `github:`.
* `git+ssh://git@github.com/NixOS/nix?ref=v1.2.3`
* `git://github.com/edolstra/dwarffs?ref=unstable&rev=e486d8d40e626a20e06d792db8cc5ac5aba9a5b4`
* `git+file:///home/my-user/some-repo/some-repo`
diff --git a/src/nix/fmt.md b/src/nix/fmt.md
index a2afde61c..b4693eb65 100644
--- a/src/nix/fmt.md
+++ b/src/nix/fmt.md
@@ -22,13 +22,13 @@ With [nixpkgs-fmt](https://github.com/nix-community/nixpkgs-fmt):
}
```
-With [nixfmt](https://github.com/serokell/nixfmt):
+With [nixfmt](https://github.com/NixOS/nixfmt):
```nix
# flake.nix
{
outputs = { nixpkgs, self }: {
- formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
+ formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
};
}
```
diff --git a/src/nix/hash.cc b/src/nix/hash.cc
index 62266fda1..2f9b3fe7c 100644
--- a/src/nix/hash.cc
+++ b/src/nix/hash.cc
@@ -79,7 +79,7 @@ struct CmdHashBase : Command
void run() override
{
- for (auto path : paths) {
+ for (const auto & path : paths) {
auto makeSink = [&]() -> std::unique_ptr {
if (modulus)
return std::make_unique(hashAlgo, *modulus);
@@ -182,7 +182,7 @@ struct CmdToBase : Command
void run() override
{
warn("The old format conversion sub commands of `nix hash` were deprecated in favor of `nix hash convert`.");
- for (auto s : args)
+ for (const auto & s : args)
logger->cout(Hash::parseAny(s, hashAlgo).to_string(hashFormat, hashFormat == HashFormat::SRI));
}
};
diff --git a/src/nix/main.cc b/src/nix/main.cc
index eff2d60a4..b0e26e093 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -435,7 +435,8 @@ void mainWrapped(int argc, char * * argv)
evalSettings.pureEval = false;
EvalState state({}, openStore("dummy://"), fetchSettings, evalSettings);
auto builtinsJson = nlohmann::json::object();
- for (auto & builtin : *state.baseEnv.values[0]->attrs()) {
+ for (auto & builtinPtr : state.getBuiltins().attrs()->lexicographicOrder(state.symbols)) {
+ auto & builtin = *builtinPtr;
auto b = nlohmann::json::object();
if (!builtin.value->isPrimOp()) continue;
auto primOp = builtin.value->primOp();
diff --git a/src/nix/meson.build b/src/nix/meson.build
index 60ee48035..5c70c8216 100644
--- a/src/nix/meson.build
+++ b/src/nix/meson.build
@@ -32,8 +32,6 @@ deps_public_maybe_subproject = [
]
subdir('build-utils-meson/subprojects')
-subdir('build-utils-meson/threads')
-
subdir('build-utils-meson/export-all-symbols')
subdir('build-utils-meson/windows-version')
@@ -65,7 +63,7 @@ add_project_arguments(
language : 'cpp',
)
-subdir('build-utils-meson/diagnostics')
+subdir('build-utils-meson/common')
subdir('build-utils-meson/generate-header')
nix_sources = [config_h] + files(
diff --git a/src/nix/realisation.cc b/src/nix/realisation.cc
index e1f231222..a386d98ea 100644
--- a/src/nix/realisation.cc
+++ b/src/nix/realisation.cc
@@ -36,7 +36,7 @@ struct CmdRealisationInfo : BuiltPathsCommand, MixJSON
Category category() override { return catSecondary; }
- void run(ref store, BuiltPaths && paths) override
+ void run(ref store, BuiltPaths && paths, BuiltPaths && rootPaths) override
{
experimentalFeatureSettings.require(Xp::CaDerivations);
RealisedPath::Set realisations;
diff --git a/src/nix/run.cc b/src/nix/run.cc
index c9857e13e..a9f9ef60f 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -180,9 +180,9 @@ void chrootHelper(int argc, char * * argv)
if (mount(realStoreDir.c_str(), (tmpDir + storeDir).c_str(), "", MS_BIND, 0) == -1)
throw SysError("mounting '%s' on '%s'", realStoreDir, storeDir);
- for (auto entry : fs::directory_iterator{"/"}) {
+ for (const auto & entry : fs::directory_iterator{"/"}) {
checkInterrupt();
- auto src = entry.path();
+ const auto & src = entry.path();
fs::path dst = tmpDir / entry.path().filename();
if (pathExists(dst)) continue;
auto st = entry.symlink_status();
diff --git a/src/nix/search.cc b/src/nix/search.cc
index c8d0b9e96..30b96c500 100644
--- a/src/nix/search.cc
+++ b/src/nix/search.cc
@@ -161,7 +161,6 @@ struct CmdSearch : InstallableValueCommand, MixJSON
{"description", description},
};
} else {
- auto name2 = hiliteMatches(name.name, nameMatches, ANSI_GREEN, "\e[0;2m");
if (results > 1) logger->cout("");
logger->cout(
"* %s%s",
diff --git a/src/nix/sigs.cc b/src/nix/sigs.cc
index 2afe4b267..134d4f34a 100644
--- a/src/nix/sigs.cc
+++ b/src/nix/sigs.cc
@@ -41,7 +41,6 @@ struct CmdCopySigs : StorePathsCommand
ThreadPool pool;
- std::string doneLabel = "done";
std::atomic added{0};
//logger->setExpected(doneLabel, storePaths.size());
diff --git a/src/nix/verify.cc b/src/nix/verify.cc
index 124a05bed..52585fe08 100644
--- a/src/nix/verify.cc
+++ b/src/nix/verify.cc
@@ -129,7 +129,7 @@ struct CmdVerify : StorePathsCommand
size_t validSigs = 0;
auto doSigs = [&](StringSet sigs) {
- for (auto sig : sigs) {
+ for (const auto & sig : sigs) {
if (!sigsSeen.insert(sig).second) continue;
if (validSigs < ValidPathInfo::maxSigs && info->checkSignature(*store, publicKeys, sig))
validSigs++;
diff --git a/src/perl/meson.build b/src/perl/meson.build
index dcb6a68a4..52d85fd60 100644
--- a/src/perl/meson.build
+++ b/src/perl/meson.build
@@ -65,7 +65,13 @@ yath = find_program('yath', required : false)
# Required Libraries
#-------------------------------------------------
-bzip2_dep = dependency('bzip2')
+bzip2_dep = dependency('bzip2', required: false)
+if not bzip2_dep.found()
+ bzip2_dep = cpp.find_library('bz2')
+ if not bzip2_dep.found()
+ error('No "bzip2" pkg-config or "bz2" library found')
+ endif
+endif
curl_dep = dependency('libcurl')
libsodium_dep = dependency('libsodium')
diff --git a/tests/functional/flakes/commit-lock-file-summary.sh b/tests/functional/flakes/commit-lock-file-summary.sh
new file mode 100644
index 000000000..314d43ec3
--- /dev/null
+++ b/tests/functional/flakes/commit-lock-file-summary.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+source ./common.sh
+
+TODO_NixOS
+
+createFlake1
+
+lockfileSummaryFlake=$TEST_ROOT/lockfileSummaryFlake
+createGitRepo "$lockfileSummaryFlake" "--initial-branch=main"
+
+# Test that the --commit-lock-file-summary flag and its alias work
+cat > "$lockfileSummaryFlake/flake.nix" < "$flake2Dir/flake.nix" < "$flakeDir/flake.nix" < "$flake2Dir/flake.nix" < "$flake3Dir/flake.nix" < "$nonFlakeDir/README.md" < "$nonFlakeDir/shebang.sh" < $nonFlakeDir/shebang-comments.sh < $nonFlakeDir/shebang-different-comments.sh < $nonFlakeDir/shebang-reject.sh < $nonFlakeDir/shebang-inline-expr.sh <> $nonFlakeDir/shebang-inline-expr.sh <<"EOF"
-#! nix --offline shell
-#! nix --impure --expr ``
-#! nix let flake = (builtins.getFlake (toString ../flake1)).packages;
-#! nix fooScript = flake.${builtins.currentSystem}.fooScript;
-#! nix /* just a comment !@#$%^&*()__+ # */
-#! nix in fooScript
-#! nix ``
-#! nix --no-write-lock-file --command bash
-set -ex
-foo
-echo "$@"
-EOF
-chmod +x $nonFlakeDir/shebang-inline-expr.sh
-
-cat > $nonFlakeDir/fooScript.nix <<"EOF"
-let flake = (builtins.getFlake (toString ../flake1)).packages;
- fooScript = flake.${builtins.currentSystem}.fooScript;
- in fooScript
-EOF
-
-cat > $nonFlakeDir/shebang-file.sh <> $nonFlakeDir/shebang-file.sh <<"EOF"
-#! nix --offline shell
-#! nix --impure --file ./fooScript.nix
-#! nix --no-write-lock-file --command bash
-set -ex
-foo
-echo "$@"
-EOF
-chmod +x $nonFlakeDir/shebang-file.sh
-
# Construct a custom registry, additionally test the --registry flag
nix registry add --registry "$registry" flake1 "git+file://$flake1Dir"
-nix registry add --registry "$registry" flake2 "git+file://$percentEncodedFlake2Dir"
nix registry add --registry "$registry" flake3 "git+file://$percentEncodedFlake3Dir"
-nix registry add --registry "$registry" flake4 flake3
nix registry add --registry "$registry" nixpkgs flake1
# Test 'nix registry list'.
-[[ $(nix registry list | wc -l) == 5 ]]
+[[ $(nix registry list | wc -l) == 4 ]]
nix registry list | grep '^global'
nix registry list | grepInverse '^user' # nothing in user registry
@@ -346,77 +220,8 @@ _NIX_FORCE_HTTP=1 nix build -o "$TEST_ROOT/result" "git+file://$percentEncodedFl
mv "$flake1Dir.tmp" "$flake1Dir"
mv "$flake2Dir.tmp" "$flake2Dir"
-# Add nonFlakeInputs to flake3.
-rm "$flake3Dir/flake.nix"
-
-cat > "$flake3Dir/flake.nix" < \$out
- [[ \$(cat \${inputs.nonFlake}/README.md) = \$(cat \${inputs.nonFlakeFile}) ]]
- [[ \${inputs.nonFlakeFile} = \${inputs.nonFlakeFile2} ]]
- '';
- };
- };
-}
-EOF
-
-cp "${config_nix}" "$flake3Dir"
-
-git -C "$flake3Dir" add flake.nix config.nix
-git -C "$flake3Dir" commit -m 'Add nonFlakeInputs'
-
-# Check whether `nix build` works with a lockfile which is missing a
-# nonFlakeInputs.
-nix build -o "$TEST_ROOT/result" "$flake3Dir#sth" --commit-lock-file
-
-nix build -o "$TEST_ROOT/result" flake3#fnord
-[[ $(cat $TEST_ROOT/result) = FNORD ]]
-
-# Check whether flake input fetching is lazy: flake3#sth does not
-# depend on flake2, so this shouldn't fail.
-rm -rf "$TEST_HOME/.cache"
-clearStore
-mv "$flake2Dir" "$flake2Dir.tmp"
-mv "$nonFlakeDir" "$nonFlakeDir.tmp"
-nix build -o "$TEST_ROOT/result" flake3#sth
-(! nix build -o "$TEST_ROOT/result" flake3#xyzzy)
-(! nix build -o "$TEST_ROOT/result" flake3#fnord)
-mv "$flake2Dir.tmp" "$flake2Dir"
-mv "$nonFlakeDir.tmp" "$nonFlakeDir"
-nix build -o "$TEST_ROOT/result" flake3#xyzzy flake3#fnord
-
# Test doing multiple `lookupFlake`s
-nix build -o "$TEST_ROOT/result" flake4#xyzzy
+nix build -o "$TEST_ROOT/result" flake3#xyzzy
# Test 'nix flake update' and --override-flake.
nix flake lock "$flake3Dir"
@@ -425,53 +230,15 @@ nix flake lock "$flake3Dir"
nix flake update --flake "$flake3Dir" --override-flake flake2 nixpkgs
[[ ! -z $(git -C "$flake3Dir" diff master || echo failed) ]]
-# Make branch "removeXyzzy" where flake3 doesn't have xyzzy anymore
-git -C "$flake3Dir" checkout -b removeXyzzy
-rm "$flake3Dir/flake.nix"
-
-cat > "$flake3Dir/flake.nix" < \$out
- '';
- };
- };
-}
-EOF
-nix flake lock "$flake3Dir"
-git -C "$flake3Dir" add flake.nix flake.lock
-git -C "$flake3Dir" commit -m 'Remove packages.xyzzy'
-git -C "$flake3Dir" checkout master
-
-# Test whether fuzzy-matching works for registry entries.
-(! nix build -o "$TEST_ROOT/result" flake4/removeXyzzy#xyzzy)
-nix build -o "$TEST_ROOT/result" flake4/removeXyzzy#sth
-
# Testing the nix CLI
nix registry add flake1 flake3
-[[ $(nix registry list | wc -l) == 6 ]]
-nix registry pin flake1
-[[ $(nix registry list | wc -l) == 6 ]]
-nix registry pin flake1 flake3
-[[ $(nix registry list | wc -l) == 6 ]]
-nix registry remove flake1
[[ $(nix registry list | wc -l) == 5 ]]
+nix registry pin flake1
+[[ $(nix registry list | wc -l) == 5 ]]
+nix registry pin flake1 flake3
+[[ $(nix registry list | wc -l) == 5 ]]
+nix registry remove flake1
+[[ $(nix registry list | wc -l) == 4 ]]
# Test 'nix registry list' with a disabled global registry.
nix registry add user-flake1 git+file://$flake1Dir
@@ -481,7 +248,7 @@ nix --flake-registry "" registry list | grepQuietInverse '^global' # nothing in
nix --flake-registry "" registry list | grepQuiet '^user'
nix registry remove user-flake1
nix registry remove user-flake2
-[[ $(nix registry list | wc -l) == 5 ]]
+[[ $(nix registry list | wc -l) == 4 ]]
# Test 'nix flake clone'.
rm -rf $TEST_ROOT/flake1-v2
@@ -643,46 +410,3 @@ nix flake metadata "$flake2Dir" --reference-lock-file $TEST_ROOT/flake2-overridd
# reference-lock-file can only be used if allow-dirty is set.
expectStderr 1 nix flake metadata "$flake2Dir" --no-allow-dirty --reference-lock-file $TEST_ROOT/flake2-overridden.lock
-
-# Test shebang
-[[ $($nonFlakeDir/shebang.sh) = "foo" ]]
-[[ $($nonFlakeDir/shebang.sh "bar") = "foo"$'\n'"bar" ]]
-[[ $($nonFlakeDir/shebang-comments.sh ) = "foo" ]]
-[[ "$($nonFlakeDir/shebang-different-comments.sh)" = "$(cat $nonFlakeDir/shebang-different-comments.sh)" ]]
-[[ $($nonFlakeDir/shebang-inline-expr.sh baz) = "foo"$'\n'"baz" ]]
-[[ $($nonFlakeDir/shebang-file.sh baz) = "foo"$'\n'"baz" ]]
-expect 1 $nonFlakeDir/shebang-reject.sh 2>&1 | grepQuiet -F 'error: unsupported unquoted character in nix shebang: *. Use double backticks to escape?'
-
-# Test that the --commit-lock-file-summary flag and its alias work
-cat > "$lockfileSummaryFlake/flake.nix" < "$nonFlakeDir/README.md" < "$flake3Dir/flake.nix" < \$out
+ [[ \$(cat \${inputs.nonFlake}/README.md) = \$(cat \${inputs.nonFlakeFile}) ]]
+ [[ \${inputs.nonFlakeFile} = \${inputs.nonFlakeFile2} ]]
+ '';
+ };
+ };
+}
+EOF
+
+cp "${config_nix}" "$flake3Dir"
+
+git -C "$flake3Dir" add flake.nix config.nix
+git -C "$flake3Dir" commit -m 'Add nonFlakeInputs'
+
+# Check whether `nix build` works with a lockfile which is missing a
+# nonFlakeInputs.
+nix build -o "$TEST_ROOT/result" "$flake3Dir#sth" --commit-lock-file
+
+nix registry add --registry "$registry" flake3 "git+file://$flake3Dir"
+
+nix build -o "$TEST_ROOT/result" flake3#fnord
+[[ $(cat "$TEST_ROOT/result") = FNORD ]]
+
+# Check whether flake input fetching is lazy: flake3#sth does not
+# depend on flake2, so this shouldn't fail.
+rm -rf "$TEST_HOME/.cache"
+clearStore
+mv "$flake2Dir" "$flake2Dir.tmp"
+mv "$nonFlakeDir" "$nonFlakeDir.tmp"
+nix build -o "$TEST_ROOT/result" flake3#sth
+(! nix build -o "$TEST_ROOT/result" flake3#xyzzy)
+(! nix build -o "$TEST_ROOT/result" flake3#fnord)
+mv "$flake2Dir.tmp" "$flake2Dir"
+mv "$nonFlakeDir.tmp" "$nonFlakeDir"
+nix build -o "$TEST_ROOT/result" flake3#xyzzy flake3#fnord
+
+# Make branch "removeXyzzy" where flake3 doesn't have xyzzy anymore
+git -C "$flake3Dir" checkout -b removeXyzzy
+rm "$flake3Dir/flake.nix"
+
+cat > "$flake3Dir/flake.nix" < \$out
+ '';
+ };
+ };
+}
+EOF
+nix flake lock "$flake3Dir"
+git -C "$flake3Dir" add flake.nix flake.lock
+git -C "$flake3Dir" commit -m 'Remove packages.xyzzy'
+git -C "$flake3Dir" checkout master
+
+# Test whether fuzzy-matching works for registry entries.
+nix registry add --registry "$registry" flake4 flake3
+(! nix build -o "$TEST_ROOT/result" flake4/removeXyzzy#xyzzy)
+nix build -o "$TEST_ROOT/result" flake4/removeXyzzy#sth
diff --git a/tests/functional/flakes/shebang.sh b/tests/functional/flakes/shebang.sh
new file mode 100644
index 000000000..576a62e2c
--- /dev/null
+++ b/tests/functional/flakes/shebang.sh
@@ -0,0 +1,109 @@
+#!/usr/bin/env bash
+
+source ./common.sh
+
+TODO_NixOS
+
+createFlake1
+
+scriptDir="$TEST_ROOT/nonFlake"
+mkdir -p "$scriptDir"
+
+cat > "$scriptDir/shebang.sh" < "$scriptDir/shebang-comments.sh" < "$scriptDir/shebang-different-comments.sh" < "$scriptDir/shebang-reject.sh" < "$scriptDir/shebang-inline-expr.sh" <> "$scriptDir/shebang-inline-expr.sh" <<"EOF"
+#! nix --offline shell
+#! nix --impure --expr ``
+#! nix let flake = (builtins.getFlake (toString ../flake1)).packages;
+#! nix fooScript = flake.${builtins.currentSystem}.fooScript;
+#! nix /* just a comment !@#$%^&*()__+ # */
+#! nix in fooScript
+#! nix ``
+#! nix --no-write-lock-file --command bash
+set -ex
+foo
+echo "$@"
+EOF
+chmod +x "$scriptDir/shebang-inline-expr.sh"
+
+cat > "$scriptDir/fooScript.nix" <<"EOF"
+let flake = (builtins.getFlake (toString ../flake1)).packages;
+ fooScript = flake.${builtins.currentSystem}.fooScript;
+ in fooScript
+EOF
+
+cat > "$scriptDir/shebang-file.sh" <> "$scriptDir/shebang-file.sh" <<"EOF"
+#! nix --offline shell
+#! nix --impure --file ./fooScript.nix
+#! nix --no-write-lock-file --command bash
+set -ex
+foo
+echo "$@"
+EOF
+chmod +x "$scriptDir/shebang-file.sh"
+
+[[ $("$scriptDir/shebang.sh") = "foo" ]]
+[[ $("$scriptDir/shebang.sh" "bar") = "foo"$'\n'"bar" ]]
+[[ $("$scriptDir/shebang-comments.sh" ) = "foo" ]]
+[[ "$("$scriptDir/shebang-different-comments.sh")" = "$(cat "$scriptDir/shebang-different-comments.sh")" ]]
+[[ $("$scriptDir/shebang-inline-expr.sh" baz) = "foo"$'\n'"baz" ]]
+[[ $("$scriptDir/shebang-file.sh" baz) = "foo"$'\n'"baz" ]]
+expect 1 "$scriptDir/shebang-reject.sh" 2>&1 | grepQuiet -F 'error: unsupported unquoted character in nix shebang: *. Use double backticks to escape?'
diff --git a/tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.err.exp b/tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.err.exp
new file mode 100644
index 000000000..d1cdc7b76
--- /dev/null
+++ b/tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.err.exp
@@ -0,0 +1,5 @@
+error: undefined variable 'd'
+ at /pwd/lang/eval-fail-attrset-merge-drops-later-rec.nix:1:26:
+ 1| { a.b = 1; a = rec { c = d + 2; d = 3; }; }.c
+ | ^
+ 2|
diff --git a/tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.nix b/tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.nix
new file mode 100644
index 000000000..fdb314b91
--- /dev/null
+++ b/tests/functional/lang/eval-fail-attrset-merge-drops-later-rec.nix
@@ -0,0 +1 @@
+{ a.b = 1; a = rec { c = d + 2; d = 3; }; }.c
diff --git a/tests/functional/lang/eval-okay-regrettable-rec-attrset-merge.exp b/tests/functional/lang/eval-okay-regrettable-rec-attrset-merge.exp
new file mode 100644
index 000000000..1e8b31496
--- /dev/null
+++ b/tests/functional/lang/eval-okay-regrettable-rec-attrset-merge.exp
@@ -0,0 +1 @@
+6
diff --git a/tests/functional/lang/eval-okay-regrettable-rec-attrset-merge.nix b/tests/functional/lang/eval-okay-regrettable-rec-attrset-merge.nix
new file mode 100644
index 000000000..8df6a2ad8
--- /dev/null
+++ b/tests/functional/lang/eval-okay-regrettable-rec-attrset-merge.nix
@@ -0,0 +1,3 @@
+# This is for backwards compatibility, not because we like it.
+# See https://github.com/NixOS/nix/issues/9020.
+{ a = rec { b = c + 1; d = 2; }; a.c = d + 3; }.a.b
diff --git a/tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp b/tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp
index a4472156b..49a07323f 100644
--- a/tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp
+++ b/tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp
@@ -1,6 +1,6 @@
-error: attribute 'z' already defined at «stdin»:3:16
- at «stdin»:2:3:
- 1| {
+error: attribute 'x.z' already defined at «stdin»:2:3
+ at «stdin»:3:16:
2| x.z = 3;
- | ^
3| x = { y = 3; z = 3; };
+ | ^
+ 4| }
diff --git a/tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp b/tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp
index ead1f0dbd..36fab2fe6 100644
--- a/tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp
+++ b/tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp
@@ -1,6 +1,6 @@
-error: attribute 'y' already defined at «stdin»:3:9
- at «stdin»:2:3:
- 1| {
+error: attribute 'x.y.y' already defined at «stdin»:2:3
+ at «stdin»:3:9:
2| x.y.y = 3;
- | ^
3| x = { y.y= 3; z = 3; };
+ | ^
+ 4| }
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 0d46f9ce2..933595cd5 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -17,12 +17,10 @@ fs = import('fs')
nix = find_program('nix')
bash = find_program('bash', native : true)
busybox = find_program('busybox', native : true, required : false)
-if host_machine.system() == 'windows'
- # Because of the state of symlinks on Windows, coreutils.exe doesn't usually exist, but things like ls.exe will
- coreutils = find_program('ls', native : true)
-else
- coreutils = find_program('coreutils', native : true)
-endif
+# Look up `coreutils` package by searching for `ls` binary.
+# Previously we looked up `coreutils` on `linux`, but that is not
+# guaranteed to exist either.
+coreutils = find_program('ls', native : true)
dot = find_program('dot', native : true, required : false)
nix_bin_dir = fs.parent(nix.full_path())
diff --git a/tests/functional/nix-shell.sh b/tests/functional/nix-shell.sh
index 2b78216f4..b054b7f75 100755
--- a/tests/functional/nix-shell.sh
+++ b/tests/functional/nix-shell.sh
@@ -167,6 +167,35 @@ EOF
chmod a+x $TEST_ROOT/marco/polo/default.nix
(cd $TEST_ROOT/marco && ./polo/default.nix | grepQuiet "Polo")
+# https://github.com/NixOS/nix/issues/11892
+mkdir $TEST_ROOT/issue-11892
+cat >$TEST_ROOT/issue-11892/shebangscript <$TEST_ROOT/issue-11892/my_package.nix < \$out/bin/my_package
+ cat \$out/bin/my_package
+ chmod a+x \$out/bin/my_package
+ '';
+}
+EOF
+chmod a+x $TEST_ROOT/issue-11892/shebangscript
+$TEST_ROOT/issue-11892/shebangscript \
+ | tee /dev/stderr \
+ | grepQuiet "ok baz11892"
+
#####################
# Flake equivalents #
diff --git a/tests/functional/restricted.sh b/tests/functional/restricted.sh
index 00ee4ddc8..a92a9b8a3 100755
--- a/tests/functional/restricted.sh
+++ b/tests/functional/restricted.sh
@@ -23,7 +23,7 @@ nix-instantiate --restrict-eval ./simple.nix -I src1=./simple.nix -I src2=./conf
(! nix-instantiate --restrict-eval --eval -E 'builtins.readFile ./simple.nix')
nix-instantiate --restrict-eval --eval -E 'builtins.readFile ./simple.nix' -I src=../..
-expectStderr 1 nix-instantiate --restrict-eval --eval -E 'let __nixPath = [ { prefix = "foo"; path = ./.; } ]; in builtins.readFile ' | grepQuiet "forbidden in restricted mode"
+expectStderr 1 nix-instantiate --restrict-eval --eval -E 'let __nixPath = [ { prefix = "foo"; path = ./.; } ]; in builtins.readFile ' | grepQuiet "was not found in the Nix search path"
nix-instantiate --restrict-eval --eval -E 'let __nixPath = [ { prefix = "foo"; path = ./.; } ]; in builtins.readFile ' -I src=.
p=$(nix eval --raw --expr "builtins.fetchurl file://${_NIX_TEST_SOURCE_DIR}/restricted.sh" --impure --restrict-eval --allowed-uris "file://${_NIX_TEST_SOURCE_DIR}")
diff --git a/tests/functional/shell.nix b/tests/functional/shell.nix
index 9cae14b78..4b1a0623a 100644
--- a/tests/functional/shell.nix
+++ b/tests/functional/shell.nix
@@ -37,7 +37,7 @@ let pkgs = rec {
mkdir -p $out
ln -s ${setupSh} $out/setup
'';
- };
+ } // { inherit mkDerivation; };
shellDrv = mkDerivation {
name = "shellDrv";
@@ -94,5 +94,9 @@ let pkgs = rec {
chmod a+rx $out/bin/ruby
'';
+ inherit (cfg) shell;
+
+ callPackage = f: args: f (pkgs // args);
+
inherit pkgs;
}; in pkgs
diff --git a/tests/functional/zstd.sh b/tests/functional/zstd.sh
index 450fb7d35..226d5eb68 100755
--- a/tests/functional/zstd.sh
+++ b/tests/functional/zstd.sh
@@ -18,7 +18,10 @@ HASH=$(nix hash path "$outPath")
clearStore
clearCacheCache
-nix copy --from "$cacheURI" "$outPath" --no-check-sigs
+nix copy --from "$cacheURI" "$outPath" --no-check-sigs --profile "$TEST_ROOT/profile" --out-link "$TEST_ROOT/result"
+
+[[ -e $TEST_ROOT/profile ]]
+[[ -e $TEST_ROOT/result ]]
if ls "$cacheDir/nar/"*.zst &> /dev/null; then
echo "files do exist"
diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
index 17bfdea38..c5f4a23aa 100644
--- a/tests/nixos/default.nix
+++ b/tests/nixos/default.nix
@@ -124,6 +124,8 @@ in
nix-copy = runNixOSTestFor "x86_64-linux" ./nix-copy.nix;
+ nix-docker = runNixOSTestFor "x86_64-linux" ./nix-docker.nix;
+
nssPreload = runNixOSTestFor "x86_64-linux" ./nss-preload.nix;
githubFlakes = runNixOSTestFor "x86_64-linux" ./github-flakes.nix;
diff --git a/tests/nixos/nix-docker-test.sh b/tests/nixos/nix-docker-test.sh
new file mode 100644
index 000000000..1f65e1a94
--- /dev/null
+++ b/tests/nixos/nix-docker-test.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+# docker.nix test script. Runs inside a built docker.nix container.
+
+set -eEuo pipefail
+
+export NIX_CONFIG='substituters = http://cache:5000?trusted=1'
+
+cd /tmp
+
+# Test getting a fetched derivation
+test "$("$(nix-build -E '(import {}).hello')"/bin/hello)" = "Hello, world!"
+
+# Test building a simple derivation
+# shellcheck disable=SC2016
+nix-build -E '
+let
+ pkgs = import {};
+in
+builtins.derivation {
+ name = "test";
+ system = builtins.currentSystem;
+ builder = "${pkgs.bash}/bin/bash";
+ args = ["-c" "echo OK > $out"];
+}'
+test "$(cat result)" = OK
+
+# Ensure #!/bin/sh shebang works
+echo '#!/bin/sh' > ./shebang-test
+echo 'echo OK' >> ./shebang-test
+chmod +x ./shebang-test
+test "$(./shebang-test)" = OK
+
+# Ensure #!/usr/bin/env shebang works
+echo '#!/usr/bin/env bash' > ./shebang-test
+echo 'echo OK' >> ./shebang-test
+chmod +x ./shebang-test
+test "$(./shebang-test)" = OK
+
+# Test nix-shell
+{
+ echo '#!/usr/bin/env nix-shell'
+ echo '#! nix-shell -i bash'
+ echo '#! nix-shell -p hello'
+ echo 'hello'
+} > ./nix-shell-test
+chmod +x ./nix-shell-test
+test "$(./nix-shell-test)" = "Hello, world!"
diff --git a/tests/nixos/nix-docker.nix b/tests/nixos/nix-docker.nix
new file mode 100644
index 000000000..dfd508988
--- /dev/null
+++ b/tests/nixos/nix-docker.nix
@@ -0,0 +1,53 @@
+# Test the container built by ../../docker.nix.
+
+{ lib, config, nixpkgs, hostPkgs, ... }:
+
+let
+ pkgs = config.nodes.machine.nixpkgs.pkgs;
+
+ nixImage = import ../../docker.nix {
+ inherit (config.nodes.machine.nixpkgs) pkgs;
+ };
+ nixUserImage = import ../../docker.nix {
+ inherit (config.nodes.machine.nixpkgs) pkgs;
+ name = "nix-user";
+ uid = 1000;
+ gid = 1000;
+ uname = "user";
+ gname = "user";
+ };
+
+ containerTestScript = ./nix-docker-test.sh;
+
+in {
+ name = "nix-docker";
+
+ nodes =
+ { machine =
+ { config, lib, pkgs, ... }:
+ { virtualisation.diskSize = 4096;
+ };
+ cache =
+ { config, lib, pkgs, ... }:
+ { virtualisation.additionalPaths = [ pkgs.stdenv pkgs.hello ];
+ services.harmonia.enable = true;
+ networking.firewall.allowedTCPPorts = [ 5000 ];
+ };
+ };
+
+ testScript = { nodes }: ''
+ cache.wait_for_unit("harmonia.service")
+
+ machine.succeed("mkdir -p /etc/containers")
+ machine.succeed("""echo '{"default":[{"type":"insecureAcceptAnything"}]}' > /etc/containers/policy.json""")
+
+ machine.succeed("${pkgs.podman}/bin/podman load -i ${nixImage}")
+ machine.succeed("${pkgs.podman}/bin/podman run --rm nix nix --version")
+ machine.succeed("${pkgs.podman}/bin/podman run --rm -i nix < ${containerTestScript}")
+
+ machine.succeed("${pkgs.podman}/bin/podman load -i ${nixUserImage}")
+ machine.succeed("${pkgs.podman}/bin/podman run --rm nix-user nix --version")
+ machine.succeed("${pkgs.podman}/bin/podman run --rm -i nix-user < ${containerTestScript}")
+ machine.succeed("[[ $(${pkgs.podman}/bin/podman run --rm nix-user stat -c %u /nix/store) = 1000 ]]")
+ '';
+}
]