From b31d4e8079802b9ec07ff97955b483ec215f3afe Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 5 Jul 2005 14:39:12 +0000 Subject: [PATCH] copy nixpkgs, so it reflects what was built. This code uses a simple "cp -a" so there is a race condition (nixpkgs being altered after the build). However, with a bit of care and "policy" this should work ;-) Also push all packages we want to push at once. svn path=/nixu/trunk/; revision=3292 --- make-disk.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/make-disk.sh b/make-disk.sh index fc8b075d152..44564a58362 100755 --- a/make-disk.sh +++ b/make-disk.sh @@ -2,15 +2,18 @@ archivesDir=/tmp/arch manifest=${archivesDir}/MANIFEST +nixpkgs=/nixpkgs/trunk/pkgs NIX_CMD_PATH=/nix/bin storeExpr=$(echo '(import ./pkgs.nix).everything' | $NIX_CMD_PATH/nix-instantiate -v -v -) -$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) -$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -)) +$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $storeExpr) $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -)) +#$NIX_CMD_PATH/nix-push --copy $archivesDir $manifest $(nix-store -r $(echo '(import ./pkgs.nix).kernel' | $NIX_CMD_PATH/nix-instantiate -)) # Location of sysvinit? #sysvinitPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).sysvinit' | $NIX_CMD_PATH/nix-instantiate -)) # Location of Nix boot scripts? #bootPath=$($NIX_CMD_PATH/nix-store -q $(echo '(import ./pkgs.nix).boot' | $NIX_CMD_PATH/nix-instantiate -)) + +cp -a ${nixpkgs} ${archivesDir}