ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #261664 from Kiskae/composefs/1.0.1

Browse Source 
composefs: 1.0.0 -> 1.0.1
This commit is contained in:
nikstur 2023-11-04 19:44:08 +01:00 committed by GitHub
commit 92846f43cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/by-name/co/composefs/package.nix
View File

@ -27,13 +27,13 @@
assert installExperimentalTools -> (!stdenv.hostPlatform.isMusl);
stdenv.mkDerivation (finalAttrs: {
pname = "composefs";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "containers";
repo = "composefs";
rev = "v${finalAttrs.version}";
hash = "sha256-OjayMhLc3otqQjHsbLN8nm9D9yGOifBcrSLixjnJmvE=";
hash = "sha256-8YbDKw4jYEU6l3Nmqu3gsT9VX0lwYF/39hhcwzgTynY=";
};
strictDeps = true;
@ -75,9 +75,8 @@ stdenv.mkDerivation (finalAttrs: {
# MUSL: https://github.com/containers/composefs/issues/204
substituteInPlace tests/Makefile \
--replace " check-checksums" ""
'' + lib.optionalString (stdenv.hostPlatform.isMusl || enableValgrindCheck) ''
# seccomp sandbox breaks these tests
# MUSL: https://github.com/containers/composefs/issues/206
'' + lib.optionalString enableValgrindCheck ''
# valgrind is incompatible with seccomp
substituteInPlace tests/test-checksums.sh \
--replace "composefs-from-json" "composefs-from-json --no-sandbox"
'';