pyrox.dev
Merge pull request #150513 from andersk/openafs
openafs: 1.8.8 → 1.8.8.1
authored by Dmitry Kalinkin and committed by GitHub 13506e9f fc58c376
+32
-7
pkgs/servers/openafs/1.8/default.nix
+32
-7
pkgs/servers/openafs/1.8/default.nix
···
1
-
{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
2
-
, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file
3
-
, docbook_xml_dtd_43, libtool_2
4
-
, withDevdoc ? false, doxygen, dblatex # Extra developer documentation
1
+
{ lib
2
+
, stdenv
3
+
, buildPackages
4
+
, fetchurl
5
+
, which
6
+
, autoconf
7
+
, automake
8
+
, flex
9
+
, bison
10
+
, glibc
11
+
, perl
12
+
, libkrb5
13
+
, libxslt
14
+
, docbook_xsl
15
+
, file
16
+
, docbook_xml_dtd_43
17
+
, libtool_2
18
+
, withDevdoc ? false
19
+
, doxygen
20
+
, dblatex # Extra developer documentation
5
21
, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
6
22
, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM
7
23
}:
···
10
26
let
11
27
inherit (lib) optional optionalString optionals;
12
28
13
-
in stdenv.mkDerivation {
29
+
in
30
+
stdenv.mkDerivation {
14
31
pname = "openafs";
15
32
inherit version srcs;
16
33
17
34
depsBuildBuild = [ buildPackages.stdenv.cc ];
18
-
nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
19
-
which bison ] ++ optionals withDevdoc [ doxygen dblatex ];
35
+
nativeBuildInputs = [
36
+
autoconf
37
+
automake
38
+
flex
39
+
libxslt
40
+
libtool_2
41
+
perl
42
+
which
43
+
bison
44
+
] ++ optionals withDevdoc [ doxygen dblatex ];
20
45
21
46
buildInputs = [ libkrb5 ncurses ];
22
47
+16
-20
pkgs/servers/openafs/1.8/module.nix
+16
-20
pkgs/servers/openafs/1.8/module.nix
···
1
-
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
2
-
, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
1
+
{ lib
2
+
, stdenv
3
+
, fetchurl
4
+
, which
5
+
, autoconf
6
+
, automake
7
+
, flex
8
+
, bison
9
+
, kernel
10
+
, glibc
11
+
, perl
12
+
, libtool_2
13
+
, libkrb5
14
+
}:
3
15
4
16
with (import ./srcs.nix {
5
17
inherit fetchurl;
···
9
21
modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs";
10
22
kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
11
23
12
-
in stdenv.mkDerivation {
24
+
in
25
+
stdenv.mkDerivation {
13
26
name = "openafs-${version}-${kernel.modDirVersion}";
14
27
inherit version src;
15
28
···
17
30
++ kernel.moduleBuildDependencies;
18
31
19
32
buildInputs = [ libkrb5 ];
20
-
21
-
patches = [
22
-
# LINUX 5.14: explicitly set set_page_dirty to default
23
-
((fetchpatch {
24
-
url = "https://gerrit.openafs.org/changes/14830/revisions/20b8a37950b3718b85a4a3d21b23469a5176eb6a/patch";
25
-
sha256 = "1mkfwq0pbwvfjspsy2lxhi0f09hljgc6xyn3y97sai0dyivn05jp";
26
-
}).overrideAttrs (o: {
27
-
postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
28
-
}))
29
-
# Linux 5.15: Convert osi_Msg macro to a function
30
-
((fetchpatch {
31
-
url = "https://gerrit.openafs.org/changes/14831/revisions/6cfa9046229d90c0625687e3fddb7877f21fbcff/patch";
32
-
sha256 = "18rip9a1krxf47fizf3f12ddq55apzb2w3wjj5qs7n3sh2nwks7g";
33
-
}).overrideAttrs (o: {
34
-
postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
35
-
}))
36
-
];
37
33
38
34
hardeningDisable = [ "pic" ];
39
35
+7
-5
pkgs/servers/openafs/1.8/srcs.nix
+7
-5
pkgs/servers/openafs/1.8/srcs.nix
···
1
1
{ fetchurl }:
2
2
rec {
3
-
version = "1.8.8";
3
+
version = "1.8.8.1";
4
4
src = fetchurl {
5
5
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
6
-
sha256 = "sha256-2qjvhqdyf6z83jvJemrRQxKcHCXuNfM0cIDsfp0oTaA=";
6
+
sha256 = "sha256-58S+1wdbzWQC4/DC1bnb52rS7jxf1d3DlzozVsoj70Q=";
7
7
};
8
8
9
-
srcs = [ src
9
+
srcs = [
10
+
src
10
11
(fetchurl {
11
12
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
12
-
sha256 = "sha256-3cxODH1KvOTxrGB+acEudxGCX1iBPjZcTfjpfraOm+U=";
13
-
})];
13
+
sha256 = "sha256-y17O3C4WS+o7SMayydbxw2v96R0GikxiqciF30j+jms=";
14
+
})
15
+
];
14
16
}