diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-04-18 00:10:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 00:10:02 +0300 |
| commit | f249f32f9e40c472c6085ddf61fb592e28c5118a (patch) | |
| tree | b3916316f6c40205eb4257820360e763d95583ba | |
| parent | 698af96454d997e7fcdbb3ecceeb96521ebe1bb6 (diff) | |
| parent | e3a83b5bc08803fa4df125199fa9d1b1b6536a06 (diff) | |
| download | nixpkgs-f249f32f9e40c472c6085ddf61fb592e28c5118a.tar nixpkgs-f249f32f9e40c472c6085ddf61fb592e28c5118a.tar.gz nixpkgs-f249f32f9e40c472c6085ddf61fb592e28c5118a.tar.bz2 nixpkgs-f249f32f9e40c472c6085ddf61fb592e28c5118a.tar.lz nixpkgs-f249f32f9e40c472c6085ddf61fb592e28c5118a.tar.xz nixpkgs-f249f32f9e40c472c6085ddf61fb592e28c5118a.tar.zst nixpkgs-f249f32f9e40c472c6085ddf61fb592e28c5118a.zip | |
Merge pull request #59791 from adisbladis/zfsUnstable-0.8.0-rc4
zfsUnstable: 0.8.0-rc3 -> 0.8.0-rc4
| -rw-r--r-- | pkgs/os-specific/linux/zfs/build-fixes-unstable.patch | 36 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 9 |
2 files changed, 39 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch b/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch new file mode 100644 index 00000000000..ff2c6e2e150 --- /dev/null +++ b/pkgs/os-specific/linux/zfs/build-fixes-unstable.patch @@ -0,0 +1,36 @@ +From b323e7a7ebb2327943851fa3fd139399eb24d3dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Mon, 13 Aug 2018 22:58:21 +0200 +Subject: [PATCH] build fixes needed for nixos + +--- + module/Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/module/Makefile.in b/module/Makefile.in +index 935bd2663..afb08df81 100644 +--- a/module/Makefile.in ++++ b/module/Makefile.in +@@ -44,15 +44,15 @@ clean: + modules_install: + @# Install the kernel modules + $(MAKE) -C @LINUX_OBJ@ M=`pwd` $@ \ +- INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \ ++ INSTALL_MOD_PATH=@prefix@/$(INSTALL_MOD_PATH) \ + INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \ + KERNELRELEASE=@LINUX_VERSION@ + @# Remove extraneous build products when packaging +- kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ +- if [ -n "$(DESTDIR)" ]; then \ ++ kmoddir=@prefix@$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \ ++ if [ -n "@prefix@" ]; then \ + find $$kmoddir -name 'modules.*' | xargs $(RM); \ + fi +- sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ ++ sysmap=@prefix@$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \ + if [ -f $$sysmap ]; then \ + depmod -ae -F $$sysmap @LINUX_VERSION@; \ + fi +-- +2.19.2 + diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 28a4836bf00..81143032c91 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -182,17 +182,14 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.0-rc3"; + version = "0.8.0-rc4"; - sha256 = "0wmkis0q2gbj7sgx3ipxngbgzjcf7ay353v3mglf2ay50q4da5i7"; + sha256 = "02cdxf62758smbqy723yqv8lkch1043alvcwhdnvya21ygcgycnw"; isUnstable = true; extraPatches = [ # in case this gets out of date, just send Mic92 a pull request! - (fetchpatch { - url = "https://github.com/Mic92/zfs/commit/bc29b5783da0af2c80c85126a1831ce1d52bfb69.patch"; - sha256 = "1sdcr1w2jp3djpwlf1f91hrxxmc34q0jl388smdkxh5n5bpw5gzw"; - }) + ./build-fixes-unstable.patch ]; spl = null; |