svn path=/nixos/trunk/; revision=13652
This commit is contained in:
parent
2897911915
commit
9c0953b439
@ -220,18 +220,12 @@ rec {
|
||||
";
|
||||
|
||||
|
||||
# Put the current directory in a tarball (making sure to filter
|
||||
# out crap like the .svn directories).
|
||||
nixosTarball = makeTarball "nixos.tar.bz2" (builtins.filterSource svnFilter ./../..);
|
||||
|
||||
svnFilter = name: type:
|
||||
let base = baseNameOf (toString name);
|
||||
in base != ".svn" && base != "result";
|
||||
# Put the current directory in a tarball.
|
||||
nixosTarball = makeTarball "nixos.tar.bz2" ../..;
|
||||
|
||||
|
||||
# Put Nixpkgs in a tarball
|
||||
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2"
|
||||
(builtins.filterSource svnFilter nixpkgsPath);
|
||||
# Put Nixpkgs in a tarball.
|
||||
nixpkgsTarball = makeTarball "nixpkgs.tar.bz2" nixpkgsPath;
|
||||
|
||||
|
||||
# The configuration file for Grub.
|
||||
|
22
release.nix
22
release.nix
@ -46,12 +46,24 @@ let
|
||||
, system ? "i686-linux"
|
||||
}:
|
||||
|
||||
(import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
|
||||
platform = system;
|
||||
compressImage = true;
|
||||
nixpkgsPath = nixpkgs.path;
|
||||
}).rescueCD;
|
||||
with import nixpkgs.path {};
|
||||
|
||||
let
|
||||
|
||||
iso = (import "${nixosSrc.path}/installer/cd-dvd/rescue-cd.nix" {
|
||||
platform = system;
|
||||
compressImage = true;
|
||||
nixpkgsPath = nixpkgs.path;
|
||||
}).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
|
||||
''; # */
|
||||
|
||||
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user