diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-04-10 09:13:36 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-04-10 09:13:36 +0200 |
| commit | 80fc5f2a24fc626218be6b9c24d3bf6ef86444fe (patch) | |
| tree | 2fa67fa3181544f6bea4ee8a7f071461c55b4d92 /pkgs/os-specific/linux/zfs | |
| parent | 0aa59a08d65461149552f68c638655ed2b474510 (diff) | |
| parent | c4f555a505f7cb2e7453459a5c734682532645e4 (diff) | |
| download | nixpkgs-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar nixpkgs-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar.gz nixpkgs-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar.bz2 nixpkgs-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar.lz nixpkgs-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar.xz nixpkgs-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.tar.zst nixpkgs-80fc5f2a24fc626218be6b9c24d3bf6ef86444fe.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 31b0cdfea8a..4cbe527de05 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -152,9 +152,9 @@ in { incompatibleKernelVersion = null; # this package should point to the latest release. - version = "0.7.7"; + version = "0.7.8"; - sha256 = "0lrzy27sh1cinkf04ki2vfjrgpgbiza2s59i2by45qdd8kmkcc5r"; + sha256 = "0m7j5cpz81lqcfbh4w3wvqjjka07wickl27klgy1zplv6vr0baix"; extraPatches = [ (fetchpatch { @@ -171,10 +171,10 @@ in { incompatibleKernelVersion = "4.16"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-04-04"; + version = "2018-04-10"; - rev = "1724eb62debfaa48f5861660615d49a994945d94"; - sha256 = "1adnmpn7b8zi5rq9r71flwx237vbysss1wywbck8407mcnrfaxzf"; + rev = "74df0c5e251a920a1966a011c16f960cd7ba562e"; + sha256 = "1x3mipj3ryznnd7kx84r3n607hv6jqs66mb61g3zcdmvk6al4yq4"; isUnstable = true; extraPatches = [ |