From 84d8ef6e2fc869b5405a9a2590d848283a48a10b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 29 Dec 2017 22:45:53 +0100
Subject: [PATCH] linuxPackages.spl: simplify expression
This package only contains a kernel module.
---
pkgs/os-specific/linux/spl/default.nix | 15 +++++----------
pkgs/top-level/all-packages.nix | 6 ++----
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index f3bd283327c8..d055aaacf92e 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -1,21 +1,18 @@
{ fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk
-, configFile ? "all"
# Kernel dependencies
-, kernel ? null
+, kernel
}:
with stdenv.lib;
let
- buildKernel = any (n: n == configFile) [ "kernel" "all" ];
- buildUser = any (n: n == configFile) [ "user" "all" ];
common = { version
, sha256
, rev ? "spl-${version}"
, broken ? false
} @ args : stdenv.mkDerivation rec {
- name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
+ name = "spl-${version}-${kernel.version}";
src = fetchFromGitHub {
owner = "zfsonlinux";
@@ -25,7 +22,7 @@ let
patches = [ ./const.patch ./install_prefix.patch ];
- nativeBuildInputs = [ autoreconfHook ] ++ optional (kernel != null) kernel.moduleBuildDependencies;
+ nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
@@ -37,8 +34,7 @@ let
'';
configureFlags = [
- "--with-config=${configFile}"
- ] ++ optionals buildKernel [
+ "--with-config=kernel"
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
];
@@ -62,8 +58,7 @@ let
};
};
in
- assert any (n: n == configFile) [ "kernel" "user" "all" ];
- assert buildKernel -> kernel != null;
+ assert kernel != null;
{
splStable = common {
version = "0.7.4";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef0780d69af1..e3b7318ef175 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12886,10 +12886,8 @@ with pkgs;
sch_cake = callPackage ../os-specific/linux/sch_cake { };
- inherit (callPackage ../os-specific/linux/spl {
- configFile = "kernel";
- inherit kernel;
- }) splStable splUnstable;
+ inherit (callPackage ../os-specific/linux/spl { })
+ splStable splUnstable;
spl = splStable;