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

linuxPackages.zfs: 0.6.5.7 -> 0.6.5.8

Browse Source 
Adds compatibility for 4.7 & 4.8 Linux kernels.
This commit is contained in:
Franz Pletz 2016-09-25 00:12:04 +02:00
parent 3a4a425728
commit c8c688b0c9
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 6 additions and 6 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

@ -17,13 +17,13 @@ assert buildKernel -> kernel != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
version = "0.6.5.7"; version = "0.6.5.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zfsonlinux"; owner = "zfsonlinux";
repo = "spl"; repo = "spl";
rev = "spl-${version}"; rev = "spl-${version}";
sha256 = "0i9ak4wqn444i6362xq5xl0msvcck8qqypp0fynrxq8mddzypwps"; sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s";
}; };
patches = [ ./const.patch ./install_prefix.patch ]; patches = [ ./const.patch ./install_prefix.patch ];
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = http://zfsonlinux.org/; homepage = http://zfsonlinux.org/;
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ jcumming wizeman wkennington ]; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
broken = buildKernel broken = buildKernel
&& (kernel.features.grsecurity or && (kernel.features.grsecurity or
# spl marked as broken until following patch is released # spl marked as broken until following patch is released

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

@ -20,13 +20,13 @@ assert buildKernel -> kernel != null && spl != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
version = "0.6.5.7"; version = "0.6.5.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zfsonlinux"; owner = "zfsonlinux";
repo = "zfs"; repo = "zfs";
rev = "zfs-${version}"; rev = "zfs-${version}";
sha256 = "17mshxyp8k7i9a7ys0rznhkz83f6650pby9ka48d6gzgcwv9nnsm"; sha256 = "0qccz1832p3i80qlrrrypypspb9sy9hmpgcfx9vmhnqmkf0yri4a";
}; };
patches = [ ./nix-build.patch ]; patches = [ ./nix-build.patch ];
@ -109,6 +109,6 @@ stdenv.mkDerivation rec {
homepage = http://zfsonlinux.org/; homepage = http://zfsonlinux.org/;
license = licenses.cddl; license = licenses.cddl;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ jcumming wizeman wkennington ]; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ];
}; };
} }