diff options
| author | Domen Kožar <domen@dev.si> | 2015-09-15 06:14:03 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-09-15 06:14:03 +0200 |
| commit | b487fb65e327fc4e06460c1a69383bc6dd5ab429 (patch) | |
| tree | 99e2efb93da51e5f75742ec16ff21c6c185fde61 /pkgs/servers | |
| parent | 60ad36ba67ee428eb34e07d2bb49149f1bf7421d (diff) | |
| parent | afff88e5997d0bbf26cf30065a4d8a63ded7bef9 (diff) | |
| download | nixlib-b487fb65e327fc4e06460c1a69383bc6dd5ab429.tar nixlib-b487fb65e327fc4e06460c1a69383bc6dd5ab429.tar.gz nixlib-b487fb65e327fc4e06460c1a69383bc6dd5ab429.tar.bz2 nixlib-b487fb65e327fc4e06460c1a69383bc6dd5ab429.tar.lz nixlib-b487fb65e327fc4e06460c1a69383bc6dd5ab429.tar.xz nixlib-b487fb65e327fc4e06460c1a69383bc6dd5ab429.tar.zst nixlib-b487fb65e327fc4e06460c1a69383bc6dd5ab429.zip | |
Merge pull request #9860 from ktosiek/openafs-linux-4.2
openafs: patches for linux 4.2
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/openafs-client/default.nix | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index e2f01206c9bd..5d8e255f47f1 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -1,13 +1,25 @@ -{ stdenv, fetchurl, which, autoconf, automake, flex, yacc, +{ stdenv, fetchurl, fetchgit, which, autoconf, automake, flex, yacc, kernel, glibc, ncurses, perl, kerberos }: +let + version = if stdenv.lib.versionAtLeast kernel.version "4.2" + then "1.6.14-1-602130" + else "1.6.14"; +in stdenv.mkDerivation { - name = "openafs-1.6.14-${kernel.version}"; - - src = fetchurl { - url = http://www.openafs.org/dl/openafs/1.6.14/openafs-1.6.14-src.tar.bz2; - sha256 = "3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f"; - }; + name = "openafs-${version}-${kernel.version}"; + + src = if version == "1.6.14-1-602130" + # 1.6.14 + patches to run on linux 4.2 that will get into 1.6.15 + then fetchgit { + url = "git://git.openafs.org/openafs.git"; + rev = "feab09080ec050b3026eff966352b058e2c2295b"; + sha256 = "03j71c7y487jbjmm6ydr1hw38pf43j2dz153xknndf4x4v21nnp2"; + } + else fetchurl { + url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; + sha256 = "3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f"; + }; buildInputs = [ autoconf automake flex yacc ncurses perl which ]; |