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

zfs_git: 2015-05-13 -> 2015-07-21

Browse Source
This commit is contained in:
William A. Kennington III 2015-07-22 12:21:25 -07:00
parent b6cd7e754b
commit c034e966bf
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
"--with-udevdir=$(out)/lib/udev"
"--with-systemdunitdir=$(out)/etc/systemd/system"
"--with-systemdpresetdir=$(out)/etc/systemd/system-preset"
"--with-mounthelperdir=$(out)/bin"
"--sysconfdir=/etc"
"--localstatedir=/var"
"--enable-systemd"
@ -69,6 +70,11 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
installFlags = [
"sysconfdir=\${out}/etc"
"DEFAULT_INITCONF_DIR=\${out}/default"
];
postInstall = ''
# Prevent kernel modules from depending on the Linux -dev output.
nuke-refs $(find $out -name "*.ko")

13
pkgs/os-specific/linux/zfs/git.nix
View File

@ -1,12 +1,13 @@
{ callPackage, stdenv, fetchgit, spl_git, ... } @ args:
{ callPackage, stdenv, fetchFromGitHub, spl_git, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "2015-05-13";
version = "2015-07-21";
src = fetchgit {
url = git://github.com/zfsonlinux/zfs.git;
rev = "7fec46b9d8967109ad289d208e8cf36a0c16e40c";
sha256 = "0gvzw6vn7wyq2g9psv0fdars7ssidqc5l85x4yym5niccy1xl437";
src = fetchFromGitHub {
owner = "zfsonlinux";
repo = "zfs";
rev = "3b79cef21294f3ec46c4f71cc5a68a75a4d0ebc7";
sha256 = "01l4cg62wgn3wzasskx2nh3a4c74vq8qcwz090x8x1r4c2r4v943";
};
patches = [ ./nix-build.patch ];