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

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-05-30 19:39:34 +00:00
parent 365379857f 2661511cdb
commit 2d382f3d98
711 changed files with 49079 additions and 11672 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/zfs/default.nix
+2 -2
View File
@@ -20,13 +20,13 @@ assert buildKernel -> kernel != null && spl != null;
stdenv.mkDerivation rec {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
version = "0.6.5.6";
version = "0.6.5.7";
src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "zfs";
rev = "zfs-${version}";
sha256 = "0lsb93y5zbwc8fafxzm9vyfpr6fmvl8h86ny4llbd2xy2hnfwk2i";
sha256 = "17mshxyp8k7i9a7ys0rznhkz83f6650pby9ka48d6gzgcwv9nnsm";
};
patches = [ ./nix-build.patch ];