From 50bcf4583fbf844d0e3bf71f4629a82444988db1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 15 Feb 2015 23:59:01 -0800 Subject: [PATCH] zfs_git: Update --- pkgs/os-specific/linux/zfs/git.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index 61349b2ab20..17a38bf1801 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -1,12 +1,16 @@ -{ callPackage, fetchgit, spl_git, ... } @ args: +{ callPackage, stdenv, fetchgit, spl_git, ... } @ args: + +let + gitVersion = "7d2868d5fc88a4c30769b44f56a3a88a4277a9ab"; +in callPackage ./generic.nix (args // rec { - version = "33b4de5"; + version = stdenv.lib.substring 0 7 gitVersion; src = fetchgit { url = git://github.com/zfsonlinux/zfs.git; - rev = "5f15fa22167ff665d0db0159551eb90759683984"; - sha256 = "14l1s1rfykj5dz1ssh5c8d1k98qn19l48sd31lwshiczx63zjygw"; + rev = gitVersion; + sha256 = "1gf0x8d0zs2h3w910agxm4nb9qr4chs54iiblnqz4k74yyhbmwgg"; }; patches = [