diff options
| -rw-r--r-- | .version (renamed from version) | 0 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | perl/configure.ac | 2 | ||||
| -rw-r--r-- | release.nix | 2 | ||||
| -rw-r--r-- | scripts/install-multi-user.sh | 1 | ||||
| -rw-r--r-- | src/libstore/store-api.hh | 1 |
6 files changed, 4 insertions, 4 deletions
diff --git a/version b/.version index c0943d3e98da..c0943d3e98da 100644 --- a/version +++ b/.version diff --git a/configure.ac b/configure.ac index 4eea008b02ac..f5b1614f19f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(nix, m4_esyscmd([bash -c "echo -n $(cat ./version)$VERSION_SUFFIX"])) +AC_INIT(nix, m4_esyscmd([bash -c "echo -n $(cat ./.version)$VERSION_SUFFIX"])) AC_CONFIG_SRCDIR(README.md) AC_CONFIG_AUX_DIR(config) diff --git a/perl/configure.ac b/perl/configure.ac index 9f49db4d2816..966700695ff5 100644 --- a/perl/configure.ac +++ b/perl/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(nix-perl, m4_esyscmd([bash -c "echo -n $(cat ../version)$VERSION_SUFFIX"])) +AC_INIT(nix-perl, m4_esyscmd([bash -c "echo -n $(cat ../.version)$VERSION_SUFFIX"])) AC_CONFIG_SRCDIR(MANIFEST) AC_CONFIG_AUX_DIR(../config) diff --git a/release.nix b/release.nix index 5c0027301b32..55808407eb87 100644 --- a/release.nix +++ b/release.nix @@ -18,7 +18,7 @@ let releaseTools.sourceTarball { name = "nix-tarball"; - version = builtins.readFile ./version; + version = builtins.readFile ./.version; versionSuffix = if officialRelease then "" else "pre${toString nix.revCount}_${nix.shortRev}"; src = nix; inherit officialRelease; diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh index f93be9d3a45b..4b65783a20ff 100644 --- a/scripts/install-multi-user.sh +++ b/scripts/install-multi-user.sh @@ -744,7 +744,6 @@ build-users-group = $NIX_BUILD_GROUP_NAME max-jobs = $NIX_USER_COUNT cores = 1 -sandbox = false EOF _sudo "to place the default nix daemon configuration (part 2)" \ install -m 0664 "$SCRATCH/nix.conf" /etc/nix/nix.conf diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index 40887b6aa3a0..7a1b31d0ff59 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -11,6 +11,7 @@ #include <atomic> #include <limits> #include <map> +#include <unordered_map> #include <unordered_set> #include <memory> #include <string> |