diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-10-10T21·11+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2011-10-10T21·11+0000 |
| commit | 6fcdbcac202e40e5de7147ff64b34d6aaad16249 (patch) | |
| tree | 3a18b2cde295fd1551bedb279948660dccd22d60 /tests/init.sh | |
| parent | 659c427caa39e44e5861ff1345425e4c34c9ced3 (diff) | |
* Install NixManifest.pm, NixConfig.pm and GeneratePatches.pm under
the Nix:: namespace.
Diffstat (limited to 'tests/init.sh')
| -rw-r--r-- | tests/init.sh | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/tests/init.sh b/tests/init.sh index 104da432eaef..0e17740f36d2 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -29,16 +29,11 @@ ln -s $TOP/scripts/nix-prefetch-url $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-collect-garbage $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-build $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-install-package $NIX_BIN_DIR/ -ln -s $TOP/scripts/nix-push $NIX_BIN_DIR/ ln -s $TOP/scripts/nix-pull $NIX_BIN_DIR/ -ln -s $TOP/scripts/nix-generate-patches $NIX_BIN_DIR/ mkdir $NIX_BIN_DIR/nix -ln -s $bzip2_bin_test/bzip2 $NIX_BIN_DIR/nix/ -ln -s $bzip2_bin_test/bunzip2 $NIX_BIN_DIR/nix/ +ln -s $NIX_BZIP2 $NIX_BIN_DIR/nix/ ln -s $TOP/scripts/copy-from-other-stores.pl $NIX_BIN_DIR/nix/ ln -s $TOP/scripts/download-using-manifests.pl $NIX_BIN_DIR/nix/ -ln -s $TOP/scripts/GeneratePatches.pm $NIX_BIN_DIR/nix/ -ln -s $TOP/scripts/NixManifest.pm $NIX_BIN_DIR/nix/ cat > "$NIX_CONF_DIR"/nix.conf <<EOF gc-keep-outputs = false @@ -53,17 +48,6 @@ cp -pr $TOP/corepkgs $NIX_DATA_DIR/nix/ # (and likely to fail). for i in \ $NIX_DATA_DIR/nix/corepkgs/nar/nar.sh \ - $NIX_BIN_DIR/nix/download-using-manifests.pl \ - $NIX_BIN_DIR/nix/copy-from-other-stores.pl \ - $NIX_BIN_DIR/nix-prefetch-url \ - $NIX_BIN_DIR/nix-collect-garbage \ - $NIX_BIN_DIR/nix-build \ - $NIX_BIN_DIR/nix-install-package \ - $NIX_BIN_DIR/nix-push \ - $NIX_BIN_DIR/nix-pull \ - $NIX_BIN_DIR/nix-generate-patches \ - $NIX_BIN_DIR/nix/NixManifest.pm \ - $NIX_BIN_DIR/nix/GeneratePatches.pm \ ; do sed < $i > $i.tmp \ -e "s^$REAL_BIN_DIR/nix-store^$NIX_BIN_DIR/nix-store^" \ |