Unverified Commit 92846f43 authored by nikstur's avatar nikstur Committed by GitHub
Browse files

Merge pull request #261664 from Kiskae/composefs/1.0.1 

composefs: 1.0.0 -> 1.0.1
parents 7fc34fad 9e8674d8

pkgs/by-name/co/composefs/package.nix

+4 −5
Original line number Diff line number Diff line
@@ -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"

  '';