summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorAtemu <atemu.main@gmail.com>2021-01-07 10:05:28 +0100
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-01-07 05:54:10 -0800
commite44a4abdbeb479a6cff041a80be9ec9e2cfa78ce (patch)
tree49413ddf1a3734624c99d99f68ba7c949cfcd5c1 /pkgs/os-specific/linux/zfs
parentc92a996c8f82467bcdd8566981d0c71b42c74833 (diff)
downloadnixpkgs-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce.tar
nixpkgs-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce.tar.gz
nixpkgs-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce.tar.bz2
nixpkgs-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce.tar.lz
nixpkgs-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce.tar.xz
nixpkgs-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce.tar.zst
nixpkgs-e44a4abdbeb479a6cff041a80be9ec9e2cfa78ce.zip
zfs: 2.0.0 -> 2.0.1
RT patch is included in this release
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix17
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 8bdf9efd445..59719922987 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -176,11 +176,6 @@ let
         maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
       };
     };
-
-  linux-rt-patch = fetchpatch {
-    url = "https://github.com/openzfs/zfs/commit/ab4fb9b74e9d089fc9a261c4f41e19697ad6a4ca.patch";
-    sha256 = "1nrxmb4rhrkgncav6dzwm66l0700fi72qkkcs0w6pkm850srws36";
-  };
 in {
   # also check if kernel version constraints in
   # ./nixos/modules/tasks/filesystems/zfs.nix needs
@@ -190,11 +185,11 @@ in {
     # incompatibleKernelVersion = "4.20";
 
     # this package should point to the latest release.
-    version = "2.0.0";
+    version = "2.0.1";
 
-    sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
+    sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
 
-    extraPatches = [ linux-rt-patch ];
+    extraPatches = [ ];
   };
 
   zfsUnstable = common {
@@ -202,10 +197,10 @@ in {
     # incompatibleKernelVersion = "4.19";
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2.0.0";
+    version = "2.0.1";
 
-    sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
+    sha256 = "0wmw823ildwm9rcfyk22pvzg100yhps3y9hfjlrpspfd1hhkbp0d";
 
-    extraPatches = [ linux-rt-patch ];
+    extraPatches = [ ];
   };
 }