diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-08 10:54:17 +0200 |
| commit | 595a72589f038e4512ca12232009c97a47fba044 (patch) | |
| tree | 079cdeab0e7722d19292fb7532adc42d77533d1f /pkgs/os-specific/linux/zfs | |
| parent | f9e17ca3f68b040bd0cf68c26104e4a5c9bc7b4f (diff) | |
| parent | 62dc989963c67fe5564b30a2b4bf21ba49446eee (diff) | |
| download | nixpkgs-595a72589f038e4512ca12232009c97a47fba044.tar nixpkgs-595a72589f038e4512ca12232009c97a47fba044.tar.gz nixpkgs-595a72589f038e4512ca12232009c97a47fba044.tar.bz2 nixpkgs-595a72589f038e4512ca12232009c97a47fba044.tar.lz nixpkgs-595a72589f038e4512ca12232009c97a47fba044.tar.xz nixpkgs-595a72589f038e4512ca12232009c97a47fba044.tar.zst nixpkgs-595a72589f038e4512ca12232009c97a47fba044.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a311aaf0d0f..d382eb74b26 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -28,7 +28,7 @@ let versionAtLeast kernel.version incompatibleKernelVersion then throw '' Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. - ${stdenv.lib.optional (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} + ${stdenv.lib.optionalString (!isUnstable) "Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."} '' else stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; @@ -168,7 +168,7 @@ in { zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known - incompatibleKernelVersion = null; + incompatibleKernelVersion = "4.16"; # this package should point to a version / git revision compatible with the latest kernel release version = "2018-04-04"; |