diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-05-23 08:19:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-23 08:19:39 +0100 |
| commit | b2b31b6cf0d0b0467bbd8e291be58d026a5266d1 (patch) | |
| tree | 1894f01a3da57ae13a1b981dacea1eb5ad24713a /pkgs/servers | |
| parent | 7ee664e545f09f73993902a0124cf5d4e93bff26 (diff) | |
| parent | 027908357f35d1e9eabd51b76a16cd7316f759cc (diff) | |
| download | nixlib-b2b31b6cf0d0b0467bbd8e291be58d026a5266d1.tar nixlib-b2b31b6cf0d0b0467bbd8e291be58d026a5266d1.tar.gz nixlib-b2b31b6cf0d0b0467bbd8e291be58d026a5266d1.tar.bz2 nixlib-b2b31b6cf0d0b0467bbd8e291be58d026a5266d1.tar.lz nixlib-b2b31b6cf0d0b0467bbd8e291be58d026a5266d1.tar.xz nixlib-b2b31b6cf0d0b0467bbd8e291be58d026a5266d1.tar.zst nixlib-b2b31b6cf0d0b0467bbd8e291be58d026a5266d1.zip | |
Merge pull request #88552 from Mic92/openafs
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/openafs/1.8/module.nix | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 4aecc851b860..d998784b3faa 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, which, autoconf, automake, flex, yacc , kernel, glibc, perl, libtool_2, kerberos, fetchpatch }: -with (import ./srcs.nix { inherit fetchurl; }); +with (import ./srcs.nix { + inherit fetchurl; +}); let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; @@ -16,6 +18,22 @@ in stdenv.mkDerivation { buildInputs = [ kerberos ]; + patches = [ + # openafs 5.6 patches, included in the next release + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/34f1689b7288688550119638ee9959e453fde414.patch"; + sha256 = "0rxjqzr8c5ajlk8wrhgjc1qp1934qiriqdi0qxsnk4gj5ibbk4d5"; + }) + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/355ea43f0d1b7feae1b3af58bc33af12838db7c3.patch"; + sha256 = "1f9xn8ql6vnxglpj3dvi30sj8vkncazjab2rc13hbw48nvsvcnhm"; + }) + (fetchpatch { + url = "https://github.com/openafs/openafs/commit/17d38e31e6f2e237a7fb4dfb46841060296310b6.patch"; + sha256 = "14dydxfm0f5fvnj0kmvgm3bgh0ajhh04i3l7l0hr9cpmwl7vrlcg"; + }) + ]; + hardeningDisable = [ "pic" ]; configureFlags = [ |