pyrox.dev / nixpkgs
lol
fork atom

Revert "makeInitrd, makeModulesClosure: reduce repetition"

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>

aszlig cb5e5a5b 4c827cb6

options
unified split
Changed files
+8 -4
pkgs
top-level
all-packages.nix
+8 -4
pkgs/top-level/all-packages.nix 
···

       
424

       
424

       
 

       



     

       
425

       
425

       
 

       
  makeAutostartItem = callPackage ../build-support/make-startupitem { };


     

       
426

       
426

       
 

       



     

       
427

       

       
-

       
  makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }@args:


     

       
428

       

       
-

       
    callPackage ../build-support/kernel/make-initrd.nix args;


     

       

       
427

       
+

       
  makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }:


     

       

       
428

       
+

       
    callPackage ../build-support/kernel/make-initrd.nix {


     

       

       
429

       
+

       
      inherit contents compressor prepend;


     

       

       
430

       
+

       
    };


     

       
429

       
431

       
 

       



     

       
430

       
432

       
 

       
  makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;


     

       
431

       
433

       
 

       



     

       
432

       

       
-

       
  makeModulesClosure = { kernel, rootModules, allowMissing ? false }@args:


     

       
433

       

       
-

       
    callPackage ../build-support/kernel/modules-closure.nix args;


     

       

       
434

       
+

       
  makeModulesClosure = { kernel, rootModules, allowMissing ? false }:


     

       

       
435

       
+

       
    callPackage ../build-support/kernel/modules-closure.nix {


     

       

       
436

       
+

       
      inherit kernel rootModules allowMissing;


     

       

       
437

       
+

       
    };


     

       
434

       
438

       
 

       



     

       
435

       
439

       
 

       
  pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;


     

       
436

       
440