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

Merge pull request #22020 from Mic92/zfs

Browse Source 
ZfsUnstable: 0.7.0-rc2 -> 0.7.0-rc3
This commit is contained in:
Jörg Thalheim 2017-01-21 23:50:28 +01:00 committed by GitHub
commit 7cb14d4353
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ in
sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s"; sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s";
}; };
splUnstable = common { splUnstable = common {
version = "0.7.0-rc2"; version = "0.7.0-rc3";
sha256 = "1y7jlyj8jwgrgnd6hiabms5h9430b6wjbnr3pwb16mv40wns1i65"; sha256 = "09v5gh7mqdl3bfq5an9iiw9fw3l1skprclxdz7r19bw3ids3lfja";
}; };
} }

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

@ -13,11 +13,11 @@ let
buildKernel = any (n: n == configFile) [ "kernel" "all" ]; buildKernel = any (n: n == configFile) [ "kernel" "all" ];
buildUser = any (n: n == configFile) [ "user" "all" ]; buildUser = any (n: n == configFile) [ "user" "all" ];
common = { version, sha256, extraPatches, spl, inkompatibleKernelVersion ? null } @ args: common = { version, sha256, extraPatches, spl, incompatibleKernelVersion ? null } @ args:
if buildKernel && if buildKernel &&
(inkompatibleKernelVersion != null) && (incompatibleKernelVersion != null) &&
versionAtLeast kernel.version inkompatibleKernelVersion then versionAtLeast kernel.version incompatibleKernelVersion then
throw "linux v${kernel.version} is not yet supported by zfsonlinux v${version}" throw "Linux v${kernel.version} is not yet supported by zfsonlinux v${version}. Try zfsUnstable or set the NixOS option boot.zfs.enableUnstable."
else stdenv.mkDerivation rec { else stdenv.mkDerivation rec {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
@ -123,7 +123,7 @@ in
# to be adapted # to be adapted
zfsStable = common { zfsStable = common {
# comment/uncomment if breaking kernel versions are known # comment/uncomment if breaking kernel versions are known
inkompatibleKernelVersion = "4.9"; incompatibleKernelVersion = "4.9";
version = "0.6.5.8"; version = "0.6.5.8";
@ -139,21 +139,16 @@ in
}; };
zfsUnstable = common { zfsUnstable = common {
# comment/uncomment if breaking kernel versions are known # comment/uncomment if breaking kernel versions are known
inkompatibleKernelVersion = "4.10"; incompatibleKernelVersion = null;
version = "0.7.0-rc2"; version = "0.7.0-rc3";
# this package should point to a version / git revision compatible with the latest kernel release # this package should point to a version / git revision compatible with the latest kernel release
sha256 = "197y2jyav9h1ksri9kzqvrwmzpb58mlgw27vfvgd4bvxpwfxq53s"; sha256 = "0js3lazqq8wb4nklqxd6sgbvwqgwnjgz3xi3mm33xf4284gia6pc";
extraPatches = [ extraPatches = [
(fetchpatch { (fetchpatch {
url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc2...nixos-zfs-0.7.0-rc2.patch"; url = "https://github.com/Mic92/zfs/compare/zfs-0.7.0-rc3...nixos-zfs-0.7.0-rc3.patch";
sha256 = "1p33bwd6p5r5phbqb657x8h9x3bd012k2mdmbzgnb09drh9v0r82"; sha256 = "1vlw98v8xvi8qapzl1jwm69qmfslwnbg3ry1lmacndaxnyckkvhh";
})
(fetchpatch {
name = "Kernel_4.9_zfs_aio_fsync_removal.patch";
url = "https://github.com/zfsonlinux/zfs/commit/99ca173929cb693012dabe98bcee4f12ec7e6e92.patch";
sha256 = "10npvpj52rpq88vdsn7zkdhx2lphzvqypsd9abdadjbqkwxld9la";
}) })
]; ];
spl = splUnstable; spl = splUnstable;