From 41058a6f86da598fcca6cc0893a298116621a17c Mon Sep 17 00:00:00 2001 From: Kiskae Date: Mon, 16 Sep 2024 18:49:24 +0200 Subject: [PATCH 1/2] composefs: 1.0.5 -> 1.0.6 --- pkgs/by-name/co/composefs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix index 80b832a56174..2fa656ba5151 100644 --- a/pkgs/by-name/co/composefs/package.nix +++ b/pkgs/by-name/co/composefs/package.nix @@ -25,13 +25,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "composefs"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "containers"; repo = "composefs"; rev = "v${finalAttrs.version}"; - hash = "sha256-2h0wwtuhvFz5IExR/Fu0l+/nTAlDpMREVRjgrhbEghw="; + hash = "sha256-9YEY7oTjWwVT2KbzTOOc6sJIGEAkdLSKDf1noF1cYuA="; }; strictDeps = true; From 120879bddd591793a6682292fb711b08c2f1794a Mon Sep 17 00:00:00 2001 From: Kiskae Date: Mon, 16 Sep 2024 18:50:28 +0200 Subject: [PATCH 2/2] composefs: use substituteInPlace fixes https://github.com/NixOS/nixpkgs/pull/335383#discussion_r1742657084 --- pkgs/by-name/co/composefs/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix index 2fa656ba5151..6ddfd98bc777 100644 --- a/pkgs/by-name/co/composefs/package.nix +++ b/pkgs/by-name/co/composefs/package.nix @@ -38,7 +38,8 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "lib" "dev" ]; postPatch = lib.optionalString installExperimentalTools '' - sed -i "s/install : false/install : true/g" tools/meson.build + substituteInPlace tools/meson.build \ + --replace-fail "install : false" "install : true" ''; nativeBuildInputs = [ meson ninja go-md2man pkg-config ];