Guest User

Untitled

a guest
Jun 14th, 2018
89
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.44 KB | None | 0 0
  1. diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
  2. index a6908024de9..70d635fbc39 100644
  3. --- a/nixos/tests/zfs.nix
  4. +++ b/nixos/tests/zfs.nix
  5. @@ -7,7 +7,21 @@ let
  6.    makeTest = import ./make-test.nix;
  7.  
  8.    makeZfsTest = name:
  9. -    { kernelPackage ? pkgs.linuxPackages_latest
  10. +    { kernelPackage ? (let myLinuxPackagesZfs = (pkgs.linuxPackagesFor (pkgs.linux_4_16.override {
  11. +        extraConfig = ''
  12. +          DEBUG_INFO y
  13. +          DEFAULT_HOSTNAME "nixos"
  14. +        ''; })).extend (
  15. +          self: super: {
  16. +      spl = super.spl.overrideAttrs (oldAttrs: rec {
  17. +              src = /home/clemens/devel/spl;
  18. +            });
  19. +      zfs = super.zfs.overrideAttrs (oldAttrs: rec {
  20. +         incompatibleKernelVersion = "";
  21. +              src = /home/clemens/devel/zfs;
  22. +            });
  23. +        });
  24. +    in pkgs.recurseIntoAttrs myLinuxPackagesZfs)
  25.      , enableUnstable ? false
  26.      , extraTest ? ""
  27.      }:
  28. diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
  29. index 11d4fc34aa9..a3bc94afd35 100644
  30. --- a/pkgs/os-specific/linux/zfs/default.nix
  31. +++ b/pkgs/os-specific/linux/zfs/default.nix
  32. @@ -148,7 +148,7 @@ in {
  33.    # to be adapted
  34.    zfsStable = common {
  35.      # comment/uncomment if breaking kernel versions are known
  36. -    incompatibleKernelVersion = "4.16";
  37. +    #incompatibleKernelVersion = "4.16";
  38.  
  39.      # this package should point to the latest release.
  40.      version = "0.7.9";
Advertisement
Add Comment
Please, Sign In to add comment