summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2024-02-06 21:19:37 -0500
committerGitHub <noreply@github.com>2024-02-06 21:19:37 -0500
commit8de926eaa9c76e3a1b708759c21aff485712e1de (patch)
tree338dcb924f96365e852d757956404dcc534d866e
parentMerge pull request #286785 from NixOS/backport-286577-to-release-23.11 (diff)
parentlinuxPackages.openafs: Patch for Linux kernel 6.7 (diff)
downloadnixpkgs-8de926eaa9c76e3a1b708759c21aff485712e1de.tar.gz
Merge pull request #286765 from NixOS/backport-285768-to-release-23.11
[Backport release-23.11] linuxPackages.openafs: Patch for Linux kernel 6.7
-rw-r--r--pkgs/servers/openafs/1.8/module.nix15
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 04db11a9a5ae..99c25d0ab1e6 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -93,6 +93,21 @@ stdenv.mkDerivation {
url = "https://git.openafs.org?p=openafs.git;a=patch;h=4f1d8104d17d2b4e95c7abaf5498db6b80aefa8f";
hash = "sha256-XJpqbDB/LOuqZj3gPHlcLeGzAQCGvPH8ArgWf+sbBJU=";
})
+ # Linux: Fix to use time_t instead of time64_t
+ (fetchpatch {
+ url = "https://git.openafs.org?p=openafs.git;a=patch;h=56763a199f92101c35d6b9b733302cb08fe0cdbe";
+ hash = "sha256-A2z+smBLQg6k+cHPpNr2s/SgoYuCOMNLcvm5LFRiqeM=";
+ })
+ # dir: Introduce struct DirEntryFlex
+ (fetchpatch {
+ url = "https://git.openafs.org?p=openafs.git;a=patch;h=fd527549c2d2b29a955f8c0427ac67c5d49ef38c";
+ hash = "sha256-jblsaJuTt3BsW5MG69ETcao/ZzSuh9aKRZyTIxZ7Ty4=";
+ })
+ # Linux 6.7: convert to inode a/mtime accessor funcs
+ (fetchpatch {
+ url = "https://git.openafs.org?p=openafs.git;a=patch;h=6edf9d350c6ffd9d5e51fb8106701c1bc2f6a4d9";
+ hash = "sha256-oQVyKzIcqzYDZHSut9Mw1t3kcEC5HGUX6eGlGJ9fZYo=";
+ })
];
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]