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-03-28 15:16:29 +00:00
parent 3f45f0948d c61445357e
commit f60c9df0ba
628 changed files with 60034 additions and 8180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,13 +17,13 @@ assert buildKernel -> kernel != null;
stdenv.mkDerivation rec {
name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
version = "0.6.5.4";
version = "0.6.5.5";
src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "spl";
rev = "spl-${version}";
sha256 = "0k80xvl15ahbs0mylfl2bd5widxhngpf7dl6zq46s21wk0795jl4";
sha256 = "1f49qv648klg2sn1v1wzwd6ls1njjj0hrazz7msd74ayhwm0zcw7";
};
patches = [ ./const.patch ./install_prefix.patch ];
@@ -64,5 +64,6 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jcumming wizeman wkennington ];
broken = (kernel.features.grsecurity or false);
};
}