summary refs log tree commit diff
path: root/nixos/release.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-09 15:00:45 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-10 13:28:22 +0200
commita7824368c26ae1809a36495f870ea7a625c55206 (patch)
treed2d811022caca204c3b83a1e6431b2bcfcb2c429 /nixos/release.nix
parent95c98166ec15fa57ad62f1298c4afc9d8d98fc23 (diff)
downloadnixlib-a7824368c26ae1809a36495f870ea7a625c55206.tar
nixlib-a7824368c26ae1809a36495f870ea7a625c55206.tar.gz
nixlib-a7824368c26ae1809a36495f870ea7a625c55206.tar.bz2
nixlib-a7824368c26ae1809a36495f870ea7a625c55206.tar.lz
nixlib-a7824368c26ae1809a36495f870ea7a625c55206.tar.xz
nixlib-a7824368c26ae1809a36495f870ea7a625c55206.tar.zst
nixlib-a7824368c26ae1809a36495f870ea7a625c55206.zip
Fix setting of .version-suffix
Diffstat (limited to 'nixos/release.nix')
-rw-r--r--nixos/release.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/release.nix b/nixos/release.nix
index 2af43ab5b87a..8409ca877174 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -85,13 +85,13 @@ in {
       expr = builtins.readFile lib/channel-expr.nix;
 
       distPhase = ''
+        rm -rf .git
         echo -n $VERSION_SUFFIX > .version-suffix
         releaseName=nixos-$VERSION$VERSION_SUFFIX
         mkdir -p $out/tarballs
         mkdir ../$releaseName
-        cp -prd ${nixpkgs} ../$releaseName/nixpkgs
+        cp -prd . ../$releaseName/nixpkgs
         chmod -R u+w ../$releaseName
-        rm -rf .git
         ln -s nixpkgs/nixos ../$releaseName/nixos
         echo "$expr" > ../$releaseName/default.nix
         NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --xml \* > /dev/null