diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index e1622a5e4dae..077a592bd024 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -30,33 +30,7 @@ stdenv.mkDerivation { version = "${version}-${kernel.modDirVersion}"; inherit src; - patches = [ - # Linux-6.10: Use filemap_alloc_folio when avail - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/0f6a3a402f4a66114da9231032bd68cdc4dee7bc.patch"; - hash = "sha256-1D0mijyF4hbd+xCONT50cd6T9eCpeM8Li3nCI7HgLPA="; - }) - # Linux-6.10: define a wrapper for vmalloc - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/658942f2791fad5e33ec7542158c16dfc66eed39.patch"; - hash = "sha256-MhfAUX/eNOEkjO0cGVbnIdObMlGtLdCnnGfJECDwO+A="; - }) - # Linux-6.10: remove includes for asm/ia32_unistd.h - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/03b280649f5e22ed74c217d7c98c3416a2fa9052.patch"; - hash = "sha256-ZdXz2ziuflqz7zNzjepuGvwDAPM31FIzsoEa4iNdLmo="; - }) - # afs: avoid empty-body warning - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/d8b56f21994ce66d8daebb7d69e792f34c1a19ed.patch"; - hash = "sha256-10VUfZdZiOC8xSPM0nq8onqiv7X/Vv4/WwGlkqWkNkQ="; - }) - # Linux 6.10: Move 'inline' before func return type - (fetchpatch { - url = "https://github.com/openafs/openafs/commit/7097eec17bc01bcfc12c4d299136b2d3b94ec3d7.patch"; - hash = "sha256-PZmqeXWJL3EQFD9250YfDwCY1rvSGVCbAhzyHP1pE0Q="; - }) - ]; + patches = [ ]; nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] ++ kernel.moduleBuildDependencies; diff --git a/pkgs/servers/openafs/1.8/srcs.nix b/pkgs/servers/openafs/1.8/srcs.nix index 53b44bd97577..3c4c24f1661b 100644 --- a/pkgs/servers/openafs/1.8/srcs.nix +++ b/pkgs/servers/openafs/1.8/srcs.nix @@ -1,16 +1,16 @@ { fetchurl }: rec { - version = "1.8.12"; + version = "1.8.13"; src = fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - hash = "sha256-EP6mgQxsCwD/ss0/OO1zLBfP15VcoJVNwkoqYXKibnU="; + hash = "sha256-eRABcMokkLEpXZuLEwWPMOI9eruJe/GgcXVddnB4vdE="; }; srcs = [ src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - hash = "sha256-ZMbDE8c9S7fHclRQo+bcSiXuHBtxt3IoSABOvOWWJWc="; + hash = "sha256-1PPUL05XZkfbIV2rc8Nl0gQ9MmrT0hqA+MRzGdPkP+U="; }) ]; }