public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17960 from obadz/nixos-install-cleanup

Browse Source 
nixos-install: remove manifest related stuff
This commit is contained in:
Eelco Dolstra 2016-08-24 17:17:57 +02:00 committed by GitHub
commit 7310a94751
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/installer/tools/nixos-install.sh
View File

@ -136,7 +136,6 @@ fi
mkdir -m 0755 -p \ mkdir -m 0755 -p \
$mountPoint/nix/var/nix/gcroots \ $mountPoint/nix/var/nix/gcroots \
$mountPoint/nix/var/nix/temproots \ $mountPoint/nix/var/nix/temproots \
$mountPoint/nix/var/nix/manifests \
$mountPoint/nix/var/nix/userpool \ $mountPoint/nix/var/nix/userpool \
$mountPoint/nix/var/nix/profiles \ $mountPoint/nix/var/nix/profiles \
$mountPoint/nix/var/nix/db \ $mountPoint/nix/var/nix/db \
@ -201,14 +200,6 @@ p=@nix@/libexec/nix/substituters
export NIX_SUBSTITUTERS=$p/copy-from-other-stores.pl:$p/download-from-binary-cache.pl export NIX_SUBSTITUTERS=$p/copy-from-other-stores.pl:$p/download-from-binary-cache.pl
# Make manifests available in the chroot.
rm -f $mountPoint/nix/var/nix/manifests/*
for i in /nix/var/nix/manifests/*.nixmanifest; do
chroot $mountPoint @nix@/bin/nix-store -r "$(readlink -f "$i")" > /dev/null
cp -pd "$i" $mountPoint/nix/var/nix/manifests/
done
if [ -z "$closure" ]; then if [ -z "$closure" ]; then
# Get the absolute path to the NixOS/Nixpkgs sources. # Get the absolute path to the NixOS/Nixpkgs sources.
nixpkgs="$(readlink -f $(nix-instantiate --find-file nixpkgs))" nixpkgs="$(readlink -f $(nix-instantiate --find-file nixpkgs))"