diff options
| author | Anders Kaseorg <andersk@mit.edu> | 2021-12-13 03:51:32 -0500 |
|---|---|---|
| committer | Anders Kaseorg <andersk@mit.edu> | 2021-12-13 03:56:18 -0500 |
| commit | 43c93f6131ec33bb6859249f6328df0eddd8564f (patch) | |
| tree | cb203479aa12f4e2f47f924cf0a5877bb255660a /pkgs/servers/openafs | |
| parent | e675946ecde5606c505540de2024e2732bae4185 (diff) | |
| download | nixlib-43c93f6131ec33bb6859249f6328df0eddd8564f.tar nixlib-43c93f6131ec33bb6859249f6328df0eddd8564f.tar.gz nixlib-43c93f6131ec33bb6859249f6328df0eddd8564f.tar.bz2 nixlib-43c93f6131ec33bb6859249f6328df0eddd8564f.tar.lz nixlib-43c93f6131ec33bb6859249f6328df0eddd8564f.tar.xz nixlib-43c93f6131ec33bb6859249f6328df0eddd8564f.tar.zst nixlib-43c93f6131ec33bb6859249f6328df0eddd8564f.zip | |
openafs: 1.8.8 → 1.8.8.1
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/servers/openafs')
| -rw-r--r-- | pkgs/servers/openafs/1.8/module.nix | 19 | ||||
| -rw-r--r-- | pkgs/servers/openafs/1.8/srcs.nix | 6 |
2 files changed, 4 insertions, 21 deletions
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index 2543aef37690..4f1404b62820 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, which, autoconf, automake, flex, bison -, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: +, kernel, glibc, perl, libtool_2, libkrb5 }: with (import ./srcs.nix { inherit fetchurl; @@ -18,23 +18,6 @@ in stdenv.mkDerivation { buildInputs = [ libkrb5 ]; - patches = [ - # LINUX 5.14: explicitly set set_page_dirty to default - ((fetchpatch { - url = "https://gerrit.openafs.org/changes/14830/revisions/20b8a37950b3718b85a4a3d21b23469a5176eb6a/patch"; - sha256 = "1mkfwq0pbwvfjspsy2lxhi0f09hljgc6xyn3y97sai0dyivn05jp"; - }).overrideAttrs (o: { - postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; - })) - # Linux 5.15: Convert osi_Msg macro to a function - ((fetchpatch { - url = "https://gerrit.openafs.org/changes/14831/revisions/6cfa9046229d90c0625687e3fddb7877f21fbcff/patch"; - sha256 = "18rip9a1krxf47fizf3f12ddq55apzb2w3wjj5qs7n3sh2nwks7g"; - }).overrideAttrs (o: { - postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; - })) - ]; - hardeningDisable = [ "pic" ]; configureFlags = [ diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index f35903e50916..75194ed61ada 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.8.8"; + version = "1.8.8.1"; src = fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "sha256-2qjvhqdyf6z83jvJemrRQxKcHCXuNfM0cIDsfp0oTaA="; + sha256 = "sha256-58S+1wdbzWQC4/DC1bnb52rS7jxf1d3DlzozVsoj70Q="; }; srcs = [ src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "sha256-3cxODH1KvOTxrGB+acEudxGCX1iBPjZcTfjpfraOm+U="; + sha256 = "sha256-y17O3C4WS+o7SMayydbxw2v96R0GikxiqciF30j+jms="; })]; } |