diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-04 16:50:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-04 16:50:47 +0100 |
| commit | b2851676c3e2c88e6ac2a5a8cbd6ea8f5aaa5dda (patch) | |
| tree | 1f146b501f2750eab1456fb2eed6f7596a6670d8 /pkgs/os-specific | |
| parent | eaaa0c109dcbe76918dd43f85eaad2b68988b47e (diff) | |
| parent | 41958e5d2b78caeff49201b5182c9106507cb7d9 (diff) | |
| download | nixlib-b2851676c3e2c88e6ac2a5a8cbd6ea8f5aaa5dda.tar nixlib-b2851676c3e2c88e6ac2a5a8cbd6ea8f5aaa5dda.tar.gz nixlib-b2851676c3e2c88e6ac2a5a8cbd6ea8f5aaa5dda.tar.bz2 nixlib-b2851676c3e2c88e6ac2a5a8cbd6ea8f5aaa5dda.tar.lz nixlib-b2851676c3e2c88e6ac2a5a8cbd6ea8f5aaa5dda.tar.xz nixlib-b2851676c3e2c88e6ac2a5a8cbd6ea8f5aaa5dda.tar.zst nixlib-b2851676c3e2c88e6ac2a5a8cbd6ea8f5aaa5dda.zip | |
Merge pull request #38434 from Mic92/zfs-unstable
linuxPackages.zfsUnstable: 2018-02-02 -> 2018-04-04
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 9460ee46c0f0..e7139d17ace6 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -66,9 +66,9 @@ in }; splUnstable = common { - version = "2018-01-24"; - rev = "23602fdb39e1254c669707ec9d2d0e6bcdbf1771"; - sha256 = "09py2dwj77f6s2qcnkwdslg5nxb3hq2bq39zpxpm6msqyifhl69h"; + version = "2018-03-09"; + rev = "43983eb2024ec6b3280e6e06a6fb621ee3bb2a41"; + sha256 = "00h7z30hzxd09cfa44w7yv7zympvdwzdximfgjvpa1layzppjpsh"; }; splLegacyCrypto = common { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index aac1576261d4..bf02044a8c45 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -161,21 +161,21 @@ in { inherit spl; }; - zfsUnstable = common { + zfsUnstable = common rec { # comment/uncomment if breaking kernel versions are known incompatibleKernelVersion = null; # this package should point to a version / git revision compatible with the latest kernel release - version = "2018-02-02"; + version = "2018-04-04"; - rev = "fbd42542686af053f0d162ec4630ffd4fff1cc30"; - sha256 = "0qzkwnnk7kz1hwvcaqlpzi5yspfhhmd2alklc07k056ddzbx52qb"; + rev = "1724eb62debfaa48f5861660615d49a994945d94"; + sha256 = "1adnmpn7b8zi5rq9r71flwx237vbysss1wywbck8407mcnrfaxzf"; isUnstable = true; extraPatches = [ (fetchpatch { - url = "https://github.com/Mic92/zfs/compare/fbd42542686af053f0d162ec4630ffd4fff1cc30...nixos-zfs-2018-02-02.patch"; - sha256 = "05wqwjm9648x60vkwxbp8l6z1q73r2a5l2ni28i2f4pla8s3ahln"; + url = "https://github.com/Mic92/zfs/compare/${rev}...nixos-zfs-2018-02-02.patch"; + sha256 = "1gqmgqi39qhk5kbbvidh8f2xqq25vj58i9x0wjqvcx6a71qj49ch"; }) ]; |