From b5ee55f81f9f65f15f9b807b4de1380a7f477baf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 15 Sep 2015 08:51:08 +0200
Subject: [PATCH] makeInitrd, makeModulesClosure: reduce repetition
After #9869.
---
pkgs/top-level/all-packages.nix | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f6710c1986e..af367e3d49e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -424,17 +424,13 @@ let
makeAutostartItem = callPackage ../build-support/make-startupitem { };
- makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }:
- callPackage ../build-support/kernel/make-initrd.nix {
- inherit contents compressor prepend;
- };
+ makeInitrd = { contents, compressor ? "gzip -9n", prepend ? [ ] }@args:
+ callPackage ../build-support/kernel/make-initrd.nix args;
makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
- makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
- callPackage ../build-support/kernel/modules-closure.nix {
- inherit kernel rootModules allowMissing;
- };
+ makeModulesClosure = { kernel, rootModules, allowMissing ? false }@args:
+ callPackage ../build-support/kernel/modules-closure.nix args;
pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;