MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #46426 from clefru/zfs-bump

Browse source 
spl/zfs: 0.7.9 -> 0.7.10
This commit is contained in:
Franz Pletz 2018-09-11 05:06:29 +00:00 committed by GitHub
commit 13b7868ecb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,13 +10,13 @@ assert kernel != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "spl-${version}-${kernel.version}"; name = "spl-${version}-${kernel.version}";
version = "0.7.9"; version = "0.7.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zfsonlinux"; owner = "zfsonlinux";
repo = "spl"; repo = "spl";
rev = "spl-${version}"; rev = "spl-${version}";
sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0"; sha256 = "1jkv6sdrd6yvaqx0jg86fjwnsqyxqb2061k7yrka7iyivgjzpi26";
}; };
patches = [ ./install_prefix.patch ]; patches = [ ./install_prefix.patch ];
@ -52,6 +52,5 @@ stdenv.mkDerivation rec {
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ]; maintainers = with maintainers; [ jcumming wizeman wkennington fpletz globin ];
broken = stdenv.lib.versionAtLeast kernel.version "4.18";
}; };
} }

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

@ -158,12 +158,12 @@ 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
incompatibleKernelVersion = "4.18"; # incompatibleKernelVersion = null;
# this package should point to the latest release. # this package should point to the latest release.
version = "0.7.9"; version = "0.7.10";
sha256 = "0krpxrvnda2jx6l71xhw9fsksyp2a6h9l9asppac3szsd1n7fp9n"; sha256 = "1kq35ij29fag77dxq21jf9ghbl4nkyjgc2bxzyry9rawznq542v1";
extraPatches = [ extraPatches = [
(fetchpatch { (fetchpatch {