From 7e3d4971b90316bbc8f03a3ba34d9b8119dd55f6 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 25 Nov 2024 10:15:42 -0400 Subject: [PATCH 1/3] dafny: fix build with strictDeps --- pkgs/by-name/da/dafny/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/da/dafny/package.nix b/pkgs/by-name/da/dafny/package.nix index 2e3b0c1e911e..6119aaf63741 100644 --- a/pkgs/by-name/da/dafny/package.nix +++ b/pkgs/by-name/da/dafny/package.nix @@ -42,7 +42,7 @@ buildDotnetModule rec { ''; dotnet-sdk = dotnetCorePackages.sdk_6_0; - buildInputs = [ jdk11 ]; + nativeBuildInputs = [ jdk11 ]; nugetDeps = ./deps.nix; # Build just these projects. Building Source/Dafny.sln includes a bunch of From 194de8cdd3d912ff8ad6c9ed2fdb67a016151581 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 25 Nov 2024 21:25:05 -0400 Subject: [PATCH 2/3] github-runner: fix build with strictDeps --- pkgs/by-name/gi/github-runner/package.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index 9b71405f3354..8e961ec2bd58 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -1,5 +1,7 @@ { + bash, buildDotnetModule, + coreutils, darwin, dotnetCorePackages, fetchFromGitHub, @@ -111,12 +113,17 @@ buildDotnetModule rec { [ which git + # needed for `uname` + coreutils ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ darwin.autoSignDarwinBinariesHook ]; - buildInputs = [ (lib.getLib stdenv.cc.cc) ]; + buildInputs = [ + (lib.getLib stdenv.cc.cc) + bash + ]; dotnet-sdk = dotnetCorePackages.sdk_8_0; dotnet-runtime = dotnetCorePackages.runtime_8_0; From 122f86cec61e73778b7bfc3b177777ab6471ebaf Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 26 Nov 2024 10:58:28 -0400 Subject: [PATCH 3/3] tagger: fix build with strictDeps --- pkgs/by-name/ta/tagger/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ta/tagger/package.nix b/pkgs/by-name/ta/tagger/package.nix index a8074cef4074..fa4074b8a524 100644 --- a/pkgs/by-name/ta/tagger/package.nix +++ b/pkgs/by-name/ta/tagger/package.nix @@ -31,11 +31,11 @@ buildDotnetModule rec { nativeBuildInputs = [ blueprint-compiler - libadwaita ]; buildInputs = [ chromaprint + libadwaita ]; runtimeDeps = [