alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

* exportBuildReferencesGraph -> exportReferencesGraph.

Browse source 
svn path=/nixos/trunk/; revision=14593
This commit is contained in:
Eelco Dolstra 2009-03-18 18:10:38 +00:00
parent 5523326664
commit 3d8df9802d
2 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
helpers/make-iso9660-image.nix
View file

@ -11,13 +11,11 @@
, # In addition to `contents', the closure of the store paths listed , # In addition to `contents', the closure of the store paths listed
# in `packages' are also placed in the Nix store of the CD. This is # in `packages' are also placed in the Nix store of the CD. This is
# a list of attribute sets {source, target} where `source' if a # a list of attribute sets {object, symlink} where `object' if a
# store path whose closure will be copied, and `target' is a symlink # store path whose closure will be copied, and `symlink' is a
# to `source' that will be added to the CD. # symlink to `object' that will be added to the CD.
storeContents ? [] storeContents ? []
, buildStoreContents ? []
, # Whether this should be an El-Torito bootable CD. , # Whether this should be an El-Torito bootable CD.
bootable ? false bootable ? false
@ -52,7 +50,5 @@ stdenv.mkDerivation {
# For obtaining the closure of `storeContents'. # For obtaining the closure of `storeContents'.
exportReferencesGraph = exportReferencesGraph =
map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents; map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents;
exportBuildReferencesGraph =
map (x: [("closure-build-" + baseNameOf x.object) x.object]) buildStoreContents;
pathsFromGraph = "${nixpkgsPath}/pkgs/build-support/kernel/paths-from-graph.pl"; pathsFromGraph = "${nixpkgsPath}/pkgs/build-support/kernel/paths-from-graph.pl";
} }

21
installer/cd-dvd/rescue-cd-configurable.nix
View file

@ -461,21 +461,16 @@ rec {
}; };
# Closures to be copied to the Nix store on the CD. # Closures to be copied to the Nix store on the CD.
storeContents = lib.uniqListExt { storeContents =
inputList= lib.concatLists lib.uniqListExt {
inputList = lib.concatLists
(map systemPackInstallClosures systemPacks); (map systemPackInstallClosures systemPacks);
getter = x : x.object.drvPath; getter = x: x.object.drvPath;
compare = lib.eqStrings; compare = lib.eqStrings;
}; }
++ lib.uniqList {
buildStoreContents = lib.uniqList inputList = lib.optionals includeBuildDeps
{ (lib.concatLists (map systemPackInstallBuildClosure systemPacks));
inputList=([]
++
(if includeBuildDeps then lib.concatLists
(map systemPackInstallBuildClosure systemPacks)
else [])
);
}; };
bootable = true; bootable = true;