From cb5e5a5b9d3d830980002378279e2cc1bf4c9753 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 16 Sep 2015 10:26:01 +0200
Subject: [PATCH] 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>
---
 pkgs/top-level/all-packages.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e806bb1bd1..f586fbb360b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;