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

Revert "makeInitrd, makeModulesClosure: reduce repetition"

Browse Source 
This reverts commit b5ee55f81f9f65f15f9b807b4de1380a7f477baf.

The reason is that the args attribute in this case doesn't contain the
optional attributes which are specified, see here for example:

$ nix-instantiate --eval -E '(args@{ bar ? 111, ... }: args) {}'
{ }
$

This essentially breaks all VM tests, because stage-1 is passing all
arguments but pkgs/build-support/vm/default.nix does not.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-09-16 10:26:01 +02:00
parent 4c827cb601
commit cb5e5a5b9d
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/top-level/all-packages.nix
View File

@ -424,13 +424,17 @@ let
makeAutostartItem = callPackage ../build-support/make-startupitem { };
makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }@args:
callPackage ../build-support/kernel/make-initrd.nix args;
makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }:
callPackage ../build-support/kernel/make-initrd.nix {
inherit contents compressor prepend;
};
makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
makeModulesClosure = { kernel, rootModules, allowMissing ? false }@args:
callPackage ../build-support/kernel/modules-closure.nix args;
makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
callPackage ../build-support/kernel/modules-closure.nix {
inherit kernel rootModules allowMissing;
};
pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;