diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-02-23T11·12+0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-23T11·12+0100 |
| commit | 6bfb082ea298ac4366d4808f3a1b7c065cf89302 (patch) | |
| tree | c716407494479f463f7c7e67d2dc86d699e2af60 | |
| parent | e58a71442ad4a538b48fc7a9938c3690628c4741 (diff) | |
| parent | b402148d8f584144b80fe159e76e553a1792ecb7 (diff) | |
Merge pull request #2694 from zimbatm/no-store-init
remove noop uses of nix-store --init
| -rw-r--r-- | release.nix | 1 | ||||
| -rw-r--r-- | scripts/install-multi-user.sh | 3 | ||||
| -rw-r--r-- | scripts/install-nix-from-closure.sh | 6 | ||||
| -rw-r--r-- | tests/common.sh.in | 1 | ||||
| -rw-r--r-- | tests/init.sh | 3 |
5 files changed, 0 insertions, 14 deletions
diff --git a/release.nix b/release.nix index 27164506752d..5c0027301b32 100644 --- a/release.nix +++ b/release.nix @@ -278,7 +278,6 @@ let pkgs.runCommand "eval-nixos" { buildInputs = [ build.x86_64-linux ]; } '' export NIX_STATE_DIR=$TMPDIR - nix-store --init nix-instantiate ${nixpkgs}/nixos/release-combined.nix -A tested --dry-run \ --arg nixpkgs '{ outPath = ${nixpkgs}; revCount = 123; shortRev = "abcdefgh"; }' diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh index 6ee8dd48582e..f93be9d3a45b 100644 --- a/scripts/install-multi-user.sh +++ b/scripts/install-multi-user.sh @@ -674,9 +674,6 @@ $NIX_INSTALLED_NIX. EOF fi - _sudo "to initialize the Nix Database" \ - $NIX_INSTALLED_NIX/bin/nix-store --init - cat ./.reginfo \ | _sudo "to load data for the first time in to the Nix Database" \ "$NIX_INSTALLED_NIX/bin/nix-store" --load-db diff --git a/scripts/install-nix-from-closure.sh b/scripts/install-nix-from-closure.sh index ab20774bbf03..fc633fa2337e 100644 --- a/scripts/install-nix-from-closure.sh +++ b/scripts/install-nix-from-closure.sh @@ -109,12 +109,6 @@ for i in $(cd "$self/store" >/dev/null && echo ./*); do done 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 echo "$0: unable to register valid paths" >&2 exit 1 diff --git a/tests/common.sh.in b/tests/common.sh.in index 6a523ca9d832..28d0e8bfd5fc 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -53,7 +53,6 @@ clearStore() { mkdir "$NIX_STORE_DIR" rm -rf "$NIX_STATE_DIR" mkdir "$NIX_STATE_DIR" - nix-store --init clearProfiles } diff --git a/tests/init.sh b/tests/init.sh index 19a12c1e2d9e..6fa4f815bfe5 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -25,9 +25,6 @@ fsync-metadata = false !include nix.conf.extra.not-there EOF -# Initialise the database. -nix-store --init - # Did anything happen? test -e "$NIX_STATE_DIR"/db/db.sqlite |