pyrox.dev
Merge pull request #335383 from Kiskae/composefs/1.0.5
composefs: 1.0.4 -> 1.0.5
authored by Mathew Polzin and committed by GitHub c9281e01 46719a75
+9
-25
pkgs/by-name/co/composefs/package.nix
+9
-25
pkgs/by-name/co/composefs/package.nix
···
3
3
, fetchFromGitHub
4
4
, fetchpatch
5
5
6
-
, autoreconfHook
6
+
, meson
7
+
, ninja
7
8
, go-md2man
8
9
, pkg-config
9
10
, openssl
10
11
, fuse3
11
12
, libcap
12
-
, libseccomp
13
13
, python3
14
14
, which
15
15
, valgrind
···
25
25
}:
26
26
stdenv.mkDerivation (finalAttrs: {
27
27
pname = "composefs";
28
-
version = "1.0.4";
28
+
version = "1.0.5";
29
29
30
30
src = fetchFromGitHub {
31
31
owner = "containers";
32
32
repo = "composefs";
33
33
rev = "v${finalAttrs.version}";
34
-
hash = "sha256-ekUFLZGWTsiJZFv3nHoxuV057zoOtWBIkt+VdtzlaU4=";
34
+
hash = "sha256-2h0wwtuhvFz5IExR/Fu0l+/nTAlDpMREVRjgrhbEghw=";
35
35
};
36
36
37
37
strictDeps = true;
38
38
outputs = [ "out" "lib" "dev" ];
39
-
40
-
patches = [
41
-
# fixes composefs-info tests, remove in next release
42
-
# https://github.com/containers/composefs/pull/291
43
-
(fetchpatch {
44
-
url = "https://github.com/containers/composefs/commit/f7465b3a57935d96451b392b07aa3a1dafb56e7b.patch";
45
-
hash = "sha256-OO3IfqLf3dQGjEgKx3Bo630KALmLAWwgdACuyZm2Ujc=";
46
-
})
47
-
];
48
39
49
40
postPatch = lib.optionalString installExperimentalTools ''
50
-
sed -i "s/noinst_PROGRAMS +\?=/bin_PROGRAMS +=/g" tools/Makefile.am
41
+
sed -i "s/install : false/install : true/g" tools/meson.build
51
42
'';
52
43
53
-
configureFlags = [
54
-
(lib.enableFeature true "man")
55
-
(lib.enableFeature enableValgrindCheck "valgrind-test")
56
-
];
57
-
58
-
nativeBuildInputs = [ autoreconfHook go-md2man pkg-config ];
44
+
nativeBuildInputs = [ meson ninja go-md2man pkg-config ];
59
45
buildInputs = [ openssl ]
60
46
++ lib.optional fuseSupport fuse3
61
47
++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) (
62
48
[
63
49
libcap
64
-
libseccomp
65
50
]
66
51
);
67
52
···
71
56
++ lib.optional fuseSupport fuse3
72
57
++ lib.filter (lib.meta.availableOn stdenv.buildPlatform) [ erofs-utils fsverity-utils ];
73
58
59
+
mesonCheckFlags = lib.optionals enableValgrindCheck "--setup=valgrind";
60
+
74
61
preCheck = ''
75
-
patchShebangs --build tests/*dir tests/*.sh
76
-
substituteInPlace tests/*.sh \
77
-
--replace-quiet " /tmp" " $TMPDIR" \
78
-
--replace-quiet " /var/tmp" " $TMPDIR"
62
+
patchShebangs --build ../tests/*dir ../tests/*.sh
79
63
'';
80
64
81
65
passthru = {