diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-01 15:48:39 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-10 13:28:22 +0200 |
| commit | 31203732b3104125e107a3141578399cab5d478f (patch) | |
| tree | 5af3aa2bb43acababf53db5fef2d9ea9f679b394 /nixos/modules/installer/cd-dvd/channel.nix | |
| parent | 041da5a6f9dfa39b20a8b4f9743e57c15a131d36 (diff) | |
| download | nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar.gz nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar.bz2 nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar.lz nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar.xz nixpkgs-31203732b3104125e107a3141578399cab5d478f.tar.zst nixpkgs-31203732b3104125e107a3141578399cab5d478f.zip | |
Update the release expressions and the channel generators
Diffstat (limited to 'nixos/modules/installer/cd-dvd/channel.nix')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/channel.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix index 8126ce46dd9..987b85d6165 100644 --- a/nixos/modules/installer/cd-dvd/channel.nix +++ b/nixos/modules/installer/cd-dvd/channel.nix @@ -14,11 +14,15 @@ let { expr = builtins.readFile ../../../lib/channel-expr.nix; } '' mkdir -p $out/nixos - cp -prd ${cleanSource ../../..} $out/nixos/nixos - cp -prd ${cleanSource <nixpkgs>} $out/nixos/nixpkgs - chmod -R u+w $out/nixos/nixos - echo -n ${config.system.nixosVersion} > $out/nixos/nixos/.version - echo -n "" > $out/nixos/nixos/.version-suffix + # FIXME: should use ../../../.. instead of <nixpkgs>, but that + # doesn't work properly if <nixos> is a symlink to + # nixpkgs/nixos. + cp -prd ${<nixpkgs>} $out/nixos/nixpkgs + ln -s nixpkgs/nixos $out/nixos/nixos + chmod -R u+w $out/nixos + rm -rf $out/nixos/nixpkgs/.git + echo -n ${config.system.nixosVersion} > $out/nixos/nixpkgs/.version + echo -n "" > $out/nixos/nixpkgs/.version-suffix echo "$expr" > $out/nixos/default.nix ''; |