Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
- index a6908024de9..70d635fbc39 100644
- --- a/nixos/tests/zfs.nix
- +++ b/nixos/tests/zfs.nix
- @@ -7,7 +7,21 @@ let
- makeTest = import ./make-test.nix;
- makeZfsTest = name:
- - { kernelPackage ? pkgs.linuxPackages_latest
- + { kernelPackage ? (let myLinuxPackagesZfs = (pkgs.linuxPackagesFor (pkgs.linux_4_16.override {
- + extraConfig = ''
- + DEBUG_INFO y
- + DEFAULT_HOSTNAME "nixos"
- + ''; })).extend (
- + self: super: {
- + spl = super.spl.overrideAttrs (oldAttrs: rec {
- + src = /home/clemens/devel/spl;
- + });
- + zfs = super.zfs.overrideAttrs (oldAttrs: rec {
- + incompatibleKernelVersion = "";
- + src = /home/clemens/devel/zfs;
- + });
- + });
- + in pkgs.recurseIntoAttrs myLinuxPackagesZfs)
- , enableUnstable ? false
- , extraTest ? ""
- }:
- diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
- index 11d4fc34aa9..a3bc94afd35 100644
- --- a/pkgs/os-specific/linux/zfs/default.nix
- +++ b/pkgs/os-specific/linux/zfs/default.nix
- @@ -148,7 +148,7 @@ in {
- # to be adapted
- zfsStable = common {
- # comment/uncomment if breaking kernel versions are known
- - incompatibleKernelVersion = "4.16";
- + #incompatibleKernelVersion = "4.16";
- # this package should point to the latest release.
- version = "0.7.9";
Advertisement
Add Comment
Please, Sign In to add comment