mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2694 from zimbatm/no-store-init

Browse source 
remove noop uses of nix-store --init
This commit is contained in:
Eelco Dolstra 2019-02-23 12:12:36 +01:00 committed by GitHub
commit 6bfb082ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
release.nix
View file

@ -278,7 +278,6 @@ let
pkgs.runCommand "eval-nixos" { buildInputs = [ build.x86_64-linux ]; } pkgs.runCommand "eval-nixos" { buildInputs = [ build.x86_64-linux ]; }
'' ''
export NIX_STATE_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR
nix-store --init
nix-instantiate ${nixpkgs}/nixos/release-combined.nix -A tested --dry-run \ nix-instantiate ${nixpkgs}/nixos/release-combined.nix -A tested --dry-run \
--arg nixpkgs '{ outPath = ${nixpkgs}; revCount = 123; shortRev = "abcdefgh"; }' --arg nixpkgs '{ outPath = ${nixpkgs}; revCount = 123; shortRev = "abcdefgh"; }'

3
scripts/install-multi-user.sh
View file

@ -674,9 +674,6 @@ $NIX_INSTALLED_NIX.
EOF EOF
fi fi
_sudo "to initialize the Nix Database" \
$NIX_INSTALLED_NIX/bin/nix-store --init
cat ./.reginfo \ cat ./.reginfo \
| _sudo "to load data for the first time in to the Nix Database" \ | _sudo "to load data for the first time in to the Nix Database" \
"$NIX_INSTALLED_NIX/bin/nix-store" --load-db "$NIX_INSTALLED_NIX/bin/nix-store" --load-db

6
scripts/install-nix-from-closure.sh
View file

@ -109,12 +109,6 @@ for i in $(cd "$self/store" >/dev/null && echo ./*); do
done done
echo "" >&2 echo "" >&2
echo "initialising Nix database..." >&2
if ! $nix/bin/nix-store --init; then
echo "$0: failed to initialize the Nix database" >&2
exit 1
fi
if ! "$nix/bin/nix-store" --load-db < "$self/.reginfo"; then if ! "$nix/bin/nix-store" --load-db < "$self/.reginfo"; then
echo "$0: unable to register valid paths" >&2 echo "$0: unable to register valid paths" >&2
exit 1 exit 1

1
tests/common.sh.in
View file

@ -53,7 +53,6 @@ clearStore() {
mkdir "$NIX_STORE_DIR" mkdir "$NIX_STORE_DIR"
rm -rf "$NIX_STATE_DIR" rm -rf "$NIX_STATE_DIR"
mkdir "$NIX_STATE_DIR" mkdir "$NIX_STATE_DIR"
nix-store --init
clearProfiles clearProfiles
} }

3
tests/init.sh
View file

@ -25,9 +25,6 @@ fsync-metadata = false
!include nix.conf.extra.not-there !include nix.conf.extra.not-there
EOF EOF
# Initialise the database.
nix-store --init
# Did anything happen? # Did anything happen?
test -e "$NIX_STATE_DIR"/db/db.sqlite test -e "$NIX_STATE_DIR"/db/db.sqlite