JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38434 from Mic92/zfs-unstable

Browse Source 
linuxPackages.zfsUnstable: 2018-02-02 -> 2018-04-04
This commit is contained in:
Jörg Thalheim 2018-04-04 16:50:47 +01:00 committed by GitHub
commit b2851676c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/spl/default.nix
View File

@ -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 {

12
pkgs/os-specific/linux/zfs/default.nix
View File

@ -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";
})
];