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

Merge pull request #50460 from dotlambda/zfs-0.7.12

Browse Source 
linuxPackages.{spl,zfs}: 0.7.11 -> 0.7.12
This commit is contained in:
Jörg Thalheim 2018-11-19 12:34:59 +00:00 committed by GitHub
commit 471c2cb7b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 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

@ -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.11"; version = "0.7.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "zfsonlinux"; owner = "zfsonlinux";
repo = "spl"; repo = "spl";
rev = "spl-${version}"; rev = "spl-${version}";
sha256 = "15h02g5k3i20y2cycc72vr6hdn8n70jmzqii8dmx9za6bl9nk2rm"; sha256 = "13zqh1g132g63zv54l3bsg5kras9mllkx9wvlnfs13chfr7vpp4p";
}; };
patches = [ ./install_prefix.patch ]; patches = [ ./install_prefix.patch ];

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.19"; # incompatibleKernelVersion = "4.19";
# this package should point to the latest release. # this package should point to the latest release.
version = "0.7.11"; version = "0.7.12";
sha256 = "0m9wkq6wf4cg8w38s3avd0bvybnv0avqwxk3gwz9rgb9rn0m98jg"; sha256 = "1j432nb3a86isghdysir9xi6l5djmb5fbc5s9zr0rwg4ziisskbh";
extraPatches = [ extraPatches = [
(fetchpatch { (fetchpatch {