about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2021-02-10 23:04:24 +0100
committerGitHub <noreply@github.com>2021-02-10 23:04:24 +0100
commite4cf0e7a45cc32c1f37a3c58e13440f4281fef91 (patch)
treed076b5c4e66e92e0d714d6190059a17d3ca073e6 /pkgs/os-specific
parent0f1cfb26f54eea3bf965d80ca0710b41486cf9a9 (diff)
parent1ed5b6a285301a0ef17bbb8378ec43a6a79b3520 (diff)
downloadnixlib-e4cf0e7a45cc32c1f37a3c58e13440f4281fef91.tar
nixlib-e4cf0e7a45cc32c1f37a3c58e13440f4281fef91.tar.gz
nixlib-e4cf0e7a45cc32c1f37a3c58e13440f4281fef91.tar.bz2
nixlib-e4cf0e7a45cc32c1f37a3c58e13440f4281fef91.tar.lz
nixlib-e4cf0e7a45cc32c1f37a3c58e13440f4281fef91.tar.xz
nixlib-e4cf0e7a45cc32c1f37a3c58e13440f4281fef91.tar.zst
nixlib-e4cf0e7a45cc32c1f37a3c58e13440f4281fef91.zip
Merge pull request #109345 from cole-h/zfs-closure
Shrink the ZFS closure by making mail support optional
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix25
1 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index a66520b6fa18..202dc9091fd5 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -8,8 +8,8 @@
 , libtirpc
 , nfs-utils
 , gawk, gnugrep, gnused, systemd
-, smartmontools, sysstat, sudo
-, pkg-config
+, smartmontools, enableMail ? false
+, sysstat, sudo, pkg-config
 
 # Kernel dependencies
 , kernel ? null
@@ -18,6 +18,8 @@
 
 with lib;
 let
+  smartmon = smartmontools.override { inherit enableMail; };
+
   buildKernel = any (n: n == configFile) [ "kernel" "all" ];
   buildUser = any (n: n == configFile) [ "user" "all" ];
 
@@ -148,7 +150,7 @@ let
       '';
 
       postFixup = let
-        path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmontools sysstat ]}:$PATH";
+        path = "PATH=${makeBinPath [ coreutils gawk gnused gnugrep util-linux smartmon sysstat ]}:$PATH";
       in ''
         for i in $out/libexec/zfs/zpool.d/*; do
           sed -i '2i${path}' $i
@@ -157,12 +159,17 @@ let
 
       outputs = [ "out" ] ++ optionals buildUser [ "lib" "dev" ];
 
-      passthru.tests = if isUnstable then
-        [ nixosTests.zfs.unstable ]
-      else [
-        nixosTests.zfs.installer
-        nixosTests.zfs.stable
-      ];
+      passthru = {
+        inherit enableMail;
+
+        tests =
+          if isUnstable then [
+            nixosTests.zfs.unstable
+          ] else [
+            nixosTests.zfs.installer
+            nixosTests.zfs.stable
+          ];
+      };
 
       meta = {
         description = "ZFS Filesystem Linux Kernel module";