diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-12 18:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 18:00:58 +0000 |
| commit | 295cda2612d6b8a487f8fced27e7721e64443760 (patch) | |
| tree | 905c43ec6452712d70a8f416a41284992c752b7e /pkgs/os-specific | |
| parent | 80180c339e5e8c7e4b9e440df777ae2fb76b1811 (diff) | |
| parent | dcd37117f653f99cd9f196a87c3ee4dfc1cb5adb (diff) | |
| download | nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar.gz nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar.bz2 nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar.lz nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar.xz nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.tar.zst nixpkgs-295cda2612d6b8a487f8fced27e7721e64443760.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index e3a856c12a4..b5260d47caa 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -19,8 +19,9 @@ , linuxPackages_5_16 ? pkgs.linuxKernel.packages.linux_5_16 }: -with lib; let + inherit (lib) any optionalString optionals optional makeBinPath; + smartmon = smartmontools.override { inherit enableMail; }; buildKernel = any (n: n == configFile) [ "kernel" "all" ]; @@ -113,7 +114,7 @@ let configureFlags = [ "--with-config=${configFile}" "--with-tirpc=1" - (withFeatureAs (buildUser && enablePython) "python" python3.interpreter) + (lib.withFeatureAs (buildUser && enablePython) "python" python3.interpreter) ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" @@ -200,9 +201,9 @@ let ''; homepage = "https://github.com/openzfs/zfs"; changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; - license = licenses.cddl; - platforms = platforms.linux; - maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; + license = lib.licenses.cddl; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. |