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

svn path=/nixos/trunk/; revision=13652

Browse Source
This commit is contained in:
Eelco Dolstra 2008-12-17 14:30:43 +00:00
parent 2897911915
commit 9c0953b439
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
installer/cd-dvd/rescue-cd.nix
View File

@ -220,18 +220,12 @@ rec {
"; ";
# Put the current directory in a tarball (making sure to filter # Put the current directory in a tarball.
# out crap like the .svn directories). nixosTarball = makeTarball "nixos.tar.bz2" ../..;
nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./../..);
svnFilter = name: type:
let base = baseNameOf (toString name);
in base != ".svn" && base != "result";
# Put Nixpkgs in a tarball # Put Nixpkgs in a tarball.
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgsPath;
(builtins.filterSource svnFilter nixpkgsPath);
# The configuration file for Grub. # The configuration file for Grub.

14
release.nix
View File

@ -46,12 +46,24 @@ let
, system ? "i686-linux" , system ? "i686-linux"
}: }:
(import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" { with import nixpkgs.path {};
let
iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
platform = system; platform = system;
compressImage = true; compressImage = true;
nixpkgsPath = nixpkgs.path; nixpkgsPath = nixpkgs.path;
}).rescueCD; }).rescueCD;
in
# Declare the ISO as a build product so that it shows up in Hydra.
runCommand "nixos-iso" {}
''
ensureDir $out/nix-support
echo "file iso" ${iso}/iso/*.iso* >> $out/nix-support/hydra-build-products
''; # */
}; };