Merge pull request #284793 from Kiskae/composefs/1.0.3

This commit is contained in:
Sandro 2024-03-01 13:53:07 +01:00 committed by GitHub
commit 32a6d567c5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -16,6 +16,7 @@
, fsverity-utils , fsverity-utils
, nix-update-script , nix-update-script
, testers , testers
, nixosTests
, fuseSupport ? lib.meta.availableOn stdenv.hostPlatform fuse3 , fuseSupport ? lib.meta.availableOn stdenv.hostPlatform fuse3
, enableValgrindCheck ? false , enableValgrindCheck ? false
@ -23,13 +24,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "composefs"; pname = "composefs";
version = "1.0.2"; version = "1.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containers"; owner = "containers";
repo = "composefs"; repo = "composefs";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-ViZkmuLFV5DN1nqWKGl+yaqhYUEOztZ1zGpxjr1U/dw="; hash = "sha256-YmredtZZKMjzJW/kxiTUmdgO/1iPIKzJsuJz8DeEdGM=";
}; };
strictDeps = true; strictDeps = true;
@ -69,7 +70,11 @@ stdenv.mkDerivation (finalAttrs: {
passthru = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; tests = {
# Broken on aarch64 unrelated to this package: https://github.com/NixOS/nixpkgs/issues/291398
inherit (nixosTests) activation-etc-overlay-immutable activation-etc-overlay-mutable;
pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
};
}; };
meta = { meta = {