mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

Merge pull request #273966 from Kiskae/composefs/1.0.2

Browse source 
composefs: 1.0.1 -> 1.0.2
This commit is contained in:
Weijia Wang 2023-12-16 23:31:49 +01:00 committed by GitHub
parent 210dd845de 752bce8328
commit ffb71fa3d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/by-name/co/composefs/package.nix
View file

@ -3,11 +3,10 @@
, fetchFromGitHub
, autoreconfHook
, pandoc
, go-md2man
, pkg-config
, openssl
, fuse3
, yajl
, libcap
, libseccomp
, python3
@ -19,21 +18,18 @@
, testers
, fuseSupport ? lib.meta.availableOn stdenv.hostPlatform fuse3
, yajlSupport ? lib.meta.availableOn stdenv.hostPlatform yajl
, enableValgrindCheck ? false
, installExperimentalTools ? false
}:
# https://github.com/containers/composefs/issues/204
assert installExperimentalTools -> (!stdenv.hostPlatform.isMusl);
stdenv.mkDerivation (finalAttrs: {
pname = "composefs";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "containers";
repo = "composefs";
rev = "v${finalAttrs.version}";
hash = "sha256-8YbDKw4jYEU6l3Nmqu3gsT9VX0lwYF/39hhcwzgTynY=";
hash = "sha256-ViZkmuLFV5DN1nqWKGl+yaqhYUEOztZ1zGpxjr1U/dw=";
};
strictDeps = true;
@ -43,14 +39,14 @@ stdenv.mkDerivation (finalAttrs: {
sed -i "s/noinst_PROGRAMS +\?=/bin_PROGRAMS +=/g" tools/Makefile.am
'';
configureFlags = lib.optionals enableValgrindCheck [
(lib.enableFeature true "valgrind-test")
configureFlags = [
(lib.enableFeature true "man")
(lib.enableFeature enableValgrindCheck "valgrind-test")
];
nativeBuildInputs = [ autoreconfHook pandoc pkg-config ];
nativeBuildInputs = [ autoreconfHook go-md2man pkg-config ];
buildInputs = [ openssl ]
++ lib.optional fuseSupport fuse3
++ lib.optional yajlSupport yajl
++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) (
[
libcap
@ -58,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: {
]
);
# yajl is required to read the test json files
doCheck = true;
nativeCheckInputs = [ python3 which ]
++ lib.optional enableValgrindCheck valgrind
@ -70,15 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
substituteInPlace tests/*.sh \
--replace " /tmp" " $TMPDIR" \
--replace " /var/tmp" " $TMPDIR"
'' + lib.optionalString (stdenv.hostPlatform.isMusl || !yajlSupport) ''
# test relies on `composefs-from-json` tool
# MUSL: https://github.com/containers/composefs/issues/204
substituteInPlace tests/Makefile \
--replace " check-checksums" ""
'' + lib.optionalString enableValgrindCheck ''
# valgrind is incompatible with seccomp
substituteInPlace tests/test-checksums.sh \
--replace "composefs-from-json" "composefs-from-json --no-sandbox"
'';
passthru = {