From 562406b68484c9798ac46fce81b3a7b43ec9420f Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 8 Dec 2024 22:26:15 -0400 Subject: [PATCH 01/15] dotnet: set sandbox profile in source-built sdk/runtime --- pkgs/development/compilers/dotnet/packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index e8819a14611c..935a7f42b3b2 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -25,6 +25,11 @@ let + '' ln -s ${vmr.man} $man ''; + propagatedSandboxProfile = lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + (allow file-read* (subpath "/private/var/db/mds/system")) + (allow mach-lookup (global-name "com.apple.SecurityServer") + (global-name "com.apple.system.opendirectoryd.membership")) + ''; } ) ); From 3afb9cfa7d9a3ce10b7f279c749fcafd715a953a Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 22 Dec 2024 15:08:20 -0400 Subject: [PATCH 02/15] dotnet: make native binaries executable in packages --- pkgs/development/compilers/dotnet/packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index 935a7f42b3b2..a82b5c3f62f0 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -71,8 +71,12 @@ let version=''${version,,} mkdir -p "$out"/share/nuget/packages/"$id" cp -r . "$out"/share/nuget/packages/"$id"/"$version" - chmod +w "$out"/share/nuget/packages/"$id"/"$version" - echo {} > "$out"/share/nuget/packages/"$id"/"$version"/.nupkg.metadata + cd "$out"/share/nuget/packages/"$id"/"$version" + chmod +w . + for dir in tools runtimes/*/native; do + [[ ! -d "$dir" ]] || chmod -R +x "$dir" + done + echo {} > .nupkg.metadata ) popd From 77dd43a1e2da5494b28c6dd5da32a188886b68fe Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 22 Dec 2024 15:08:42 -0400 Subject: [PATCH 03/15] dotnet/wrapper: add ready-to-run sdk test --- pkgs/development/compilers/dotnet/wrapper.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index d328dbf97b7e..d268476c2c14 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -204,6 +204,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { runtime = null; run = checkConsoleOutput "$src/bin/test"; }; + + ready-to-run = mkConsoleTest { + name = "ready-to-run"; + usePackageSource = true; + build = "dotnet publish --use-current-runtime -p:PublishReadyToRun=true -o $out/bin"; + run = checkConsoleOutput "$src/bin/test"; + }; } // lib.optionalAttrs finalAttrs.finalPackage.hasILCompiler { aot = mkConsoleTest { From 691f0c0f0af67bae33eb57829664d0f8a6ce43aa Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 21 Jan 2025 12:04:01 -0400 Subject: [PATCH 04/15] dotnetCorePackages.dotnet_{8,9}.vmr: mark broken on x86_64-darwin --- pkgs/development/compilers/dotnet/vmr.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index d6d86c0b1837..80c1ddfeaa71 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -481,5 +481,8 @@ stdenv.mkDerivation rec { "x86_64-darwin" "aarch64-darwin" ]; + # build deadlocks intermittently on rosetta + # https://github.com/dotnet/runtime/issues/111628 + broken = stdenv.hostPlatform.system == "x86_64-darwin"; }; } From 53553b3cd71bbcbe224b6451cf03fd98e993ced2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Jan 2025 15:59:27 -0800 Subject: [PATCH 05/15] python313Packages.whey: follow contributing guidelines --- .../python-modules/whey/default.nix | 46 +++++++++++++++---- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix index 7c1aaec13e6c..61ef34e74ad6 100644 --- a/pkgs/development/python-modules/whey/default.nix +++ b/pkgs/development/python-modules/whey/default.nix @@ -1,30 +1,41 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, lib, setuptools, attrs, click, consolekit, dist-meta, + docutils, dom-toml, domdf-python-tools, + editables, handy-archives, natsort, packaging, pyproject-parser, + pytestCheckHook, shippinglabel, }: + buildPythonPackage rec { pname = "whey"; version = "0.1.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-l72fjczuuDXg/cDiqJ7roNVm4X+au+1u4AA8Szs1bNo="; + src = fetchFromGitHub { + owner = "repo-helper"; + repo = "whey"; + tag = "v${version}"; + hash = "sha256-s2jZmuFj0gTWVTcXWcBhcu5RBuaf/qMS/xzIpIoG1ZE="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'setuptools!=61.*,<=67.1.0,>=40.6.0' setuptools + ''; + build-system = [ setuptools ]; dependencies = [ @@ -41,14 +52,29 @@ buildPythonPackage rec { shippinglabel ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' - ''; + pythonImportsCheck = [ "whey" ]; + + optional-dependencies = { + all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies)); + editable = [ + editables + ]; + readme = [ + docutils + pyproject-parser + ] ++ pyproject-parser.optional-dependencies.readme; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # missing dependency pyproject-examples + doCheck = false; meta = { - description = "A simple Python wheel builder for simple projects."; - homepage = "https://pypi.org/project/whey"; + description = "Simple Python wheel builder for simple projects"; + homepage = "https://github.com/repo-helper/whey"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tyberius-prime ]; }; From a0059ad85216503244ee58e07f92796efa6e7ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 22 Jan 2025 16:04:39 -0800 Subject: [PATCH 06/15] python313Packages.whey-pth: follow contributing guidelines --- .../python-modules/whey-pth/default.nix | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/whey-pth/default.nix b/pkgs/development/python-modules/whey-pth/default.nix index c40292ede641..a389860d1e2d 100644 --- a/pkgs/development/python-modules/whey-pth/default.nix +++ b/pkgs/development/python-modules/whey-pth/default.nix @@ -1,21 +1,30 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, lib, setuptools, dom-toml, whey, + pytestCheckHook, }: + buildPythonPackage rec { pname = "whey-pth"; version = "0.0.6"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-CIpgqzNXW3VpS+k6BCpc2DNyqwgt/Af3ms59AH/V5KM="; + src = fetchFromGitHub { + owner = "repo-helper"; + repo = "whey-pth"; + tag = "v${version}"; + hash = "sha256-A+bXB9F8FD+A1iRuETIxP12bkH/5NKcx01ERXJZAj+Q="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'setuptools!=61.*,<=67.1.0,>=40.6.0' setuptools + ''; + build-system = [ setuptools ]; dependencies = [ @@ -23,14 +32,18 @@ buildPythonPackage rec { whey ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail '"setuptools!=61.*,<=67.1.0,>=40.6.0"' '"setuptools"' - ''; + pythonImportsCheck = [ "whey_pth" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # missing dependency coincidence + doCheck = false; meta = { - description = "Extension to whey to support .pth files."; - homepage = "https://pypi.org/project/whey-pth"; + description = "Extension to whey to support .pth files"; + homepage = "https://github.com/repo-helper/whey-pth"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ tyberius-prime ]; }; From 64aa1fa04ce8d287ba3619526c21121d2fa83271 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 14:06:28 +0000 Subject: [PATCH 07/15] proxsuite-nlp: 0.10.0 -> 0.10.1 --- pkgs/by-name/pr/proxsuite-nlp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proxsuite-nlp/package.nix b/pkgs/by-name/pr/proxsuite-nlp/package.nix index f522a4c9618a..2abd4d6c8fd8 100644 --- a/pkgs/by-name/pr/proxsuite-nlp/package.nix +++ b/pkgs/by-name/pr/proxsuite-nlp/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxsuite-nlp"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Simple-Robotics"; repo = "proxsuite-nlp"; rev = "v${finalAttrs.version}"; - hash = "sha256-JWMvPIxmZ5vSVS3nSlhFyNu8hLSVTc7Hdvd4YmE/pI8="; + hash = "sha256-+zg3QGPLqrvwT7rjnYXTUwIzHlHrIAISj/+Q9HU4cYs="; }; outputs = [ From e45317132ed0e9b536b74b614352ac81bde4fbf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Jan 2025 16:08:50 +0000 Subject: [PATCH 08/15] microsoft-edge: 131.0.2903.112 -> 132.0.2957.127 --- pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 3fcea059026f..8d7541949160 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -168,11 +168,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "131.0.2903.112"; + version = "132.0.2957.127"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-4qQNcoBXOS4Uz+MR4jItOgcnMKqB6J541cvrb5md/oc="; + hash = "sha256-uoC8oxkrMWgmkUbgn7OP21lpEadKZmb4Heb32zEvdjE="; }; # With strictDeps on, some shebangs were not being patched correctly From 40ee633534477426e4d4823fcdf00e10791599a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 05:04:19 +0000 Subject: [PATCH 09/15] melonDS: 1.0rc-unstable-2024-12-26 -> 1.0rc-unstable-2025-01-17 --- pkgs/by-name/me/melonDS/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 925dd9ae63e8..065e886a149e 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "1.0rc-unstable-2024-12-26"; + version = "1.0rc-unstable-2025-01-17"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "0c5dd28b1c5c1d17a2ce87efbd858059a8f9376f"; - hash = "sha256-hIpIt+krUpSW1T05Vq02IU5Lfaj4Sgg18qMoMH45NaE="; + rev = "15c3faa26e879bdcff615558ded6dd886681ccae"; + hash = "sha256-X9UqAAsACc3vVaWKNvT+swZXygIvaWOgFRUFzSAMjGM="; }; nativeBuildInputs = [ From e7b631559b45750e4eb9c8f5022d5b2590afe4c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 12:38:21 +0000 Subject: [PATCH 10/15] tfswitch: 1.2.4 -> 1.3.0 --- pkgs/by-name/tf/tfswitch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix index 5622d2c5b0d7..c28d39cd7dc1 100644 --- a/pkgs/by-name/tf/tfswitch/package.nix +++ b/pkgs/by-name/tf/tfswitch/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "tfswitch"; - version = "1.2.4"; + version = "1.3.0"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = "v${version}"; - sha256 = "sha256-zmGJiwdESf+3yXM7W64iSy38lADZmA03dI1yhtv9H28="; + sha256 = "sha256-Rpr/S22UX6+fHc71jnMo6kR+8kjJAboLog9vMwYTpnQ="; }; - vendorHash = "sha256-paJC46AJRaB5RieKs6wZYzshxAp8e8MvCatGsN8E4Io="; + vendorHash = "sha256-9oM7VrPZrZlR1s+vvjwpWvKdmknfbgd3hpvYByKQtgs="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com From 7075f9eaa37c3606ee5327f10e4b0883dad038d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 13:46:37 +0000 Subject: [PATCH 11/15] simdutf: 6.0.3 -> 6.1.1 --- pkgs/by-name/si/simdutf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index d15bd3ffebd5..2cbe99cf9db1 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "6.0.3"; + version = "6.1.1"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-BTnj7SUKgbJ2LM2gzw+8bSJ4+Zd6Z/KZy9B46fxIvsg="; + hash = "sha256-VAIxoTXOcWA2V+vx+AsCArkjprFiZun5BJoP1l3FGk0="; }; # Fix build on darwin From 07271da986a0a0d71aff4f178b8b68ff25533796 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 22 Sep 2024 23:36:05 -0300 Subject: [PATCH 12/15] dotnet: default to source-built sdk/runtimes --- .../editors/jetbrains/default.nix | 8 +- pkgs/by-name/al/alcom/package.nix | 3 + pkgs/by-name/av/avalonia/package.nix | 4 +- .../be/beatsabermodmanager/package.nix | 6 +- pkgs/by-name/bi/bicep/package.nix | 2 +- pkgs/by-name/bi/bililiverecorder/package.nix | 4 +- pkgs/by-name/bo/boogie/package.nix | 2 +- pkgs/by-name/dy/dyalog/package.nix | 4 +- pkgs/by-name/gh/gh-gei/package.nix | 2 +- pkgs/by-name/go/godot_4/package.nix | 9 +- pkgs/by-name/ms/msbuild/package.nix | 2 +- pkgs/by-name/na/naps2/package.nix | 2 +- pkgs/by-name/ne/networkminer/package.nix | 2 +- pkgs/by-name/pa/pablodraw/package.nix | 4 +- pkgs/by-name/ro/roslyn/package.nix | 2 +- pkgs/by-name/ry/ryujinx/package.nix | 2 +- pkgs/by-name/so/sonarr/package.nix | 4 +- pkgs/by-name/wa/wasabibackend/package.nix | 4 +- .../compilers/dotnet/8/default.nix | 2 +- .../compilers/dotnet/9/default.nix | 2 +- .../compilers/dotnet/combine-packages.nix | 2 +- pkgs/development/compilers/dotnet/default.nix | 161 ++-- pkgs/development/tools/marksman/default.nix | 2 +- pkgs/games/openra/build-engine.nix | 4 +- pkgs/servers/jackett/default.nix | 10 +- pkgs/servers/jackett/deps.json | 885 ------------------ pkgs/servers/nosql/eventstore/default.nix | 4 +- pkgs/top-level/all-packages.nix | 12 +- 28 files changed, 160 insertions(+), 990 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 4b0828a47371..29096bacf57f 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -15,7 +15,7 @@ in zlib, python3, lldb, - dotnet-sdk_8, + dotnetCorePackages, maven, openssl, expat, @@ -44,6 +44,8 @@ let products = versions.${system} or (throw "Unsupported system: ${system}"); + dotnet-sdk = dotnetCorePackages.sdk_8_0-source; + package = if stdenv.hostPlatform.isDarwin then ./bin/darwin.nix else ./bin/linux.nix; mkJetBrainsProductCore = callPackage package { inherit vmopts; }; mkMeta = meta: fromSource: { @@ -188,7 +190,7 @@ rec { for dir in plugins/clion-radler/DotFiles/linux-*; do rm -rf $dir/dotnet - ln -s ${dotnet-sdk_8.unwrapped}/share/dotnet $dir/dotnet + ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet done ) ''; @@ -352,7 +354,7 @@ rec { for dir in lib/ReSharperHost/linux-*; do rm -rf $dir/dotnet - ln -s ${dotnet-sdk_8.unwrapped}/share/dotnet $dir/dotnet + ln -s ${dotnet-sdk}/share/dotnet $dir/dotnet done ) ''; diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index 35336e223729..55a8997e8f72 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -106,6 +106,9 @@ rustPlatform.buildRustPackage { -p:Deterministic=true ''; + # NuGet.targets(156,5): error : Unable to load the service index for source https://api.nuget.org/v3/index.json. + NuGetAudit = "false"; + passthru = { inherit (dotnetBuild) fetch-deps; }; diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 0484dd665c42..3bea156c1c91 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -26,8 +26,8 @@ let dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0_1xx - runtime_6_0 + sdk_7_0_1xx-bin + runtime_6_0-bin ]; npmDepsFile = ./npm-deps.nix; diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index 486dd4217b77..51e6b983ec19 100644 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -21,11 +21,11 @@ buildDotnetModule rec { }; dotnet-sdk = with dotnetCorePackages; combinePackages [ - sdk_7_0 - sdk_6_0 + sdk_7_0-bin + sdk_6_0-bin ]; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0-bin; projectFile = [ "BeatSaberModManager/BeatSaberModManager.csproj" ]; diff --git a/pkgs/by-name/bi/bicep/package.nix b/pkgs/by-name/bi/bicep/package.nix index dc3c3cb908a8..4a824fea8da0 100644 --- a/pkgs/by-name/bi/bicep/package.nix +++ b/pkgs/by-name/bi/bicep/package.nix @@ -26,7 +26,7 @@ buildDotnetModule rec { nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix index 3efa80e687ea..af7b1b432a36 100644 --- a/pkgs/by-name/bi/bililiverecorder/package.nix +++ b/pkgs/by-name/bi/bililiverecorder/package.nix @@ -9,8 +9,8 @@ let pname = "bililiverecorder"; dotnet = with dotnetCorePackages; combinePackages [ - runtime_6_0 - aspnetcore_6_0 + runtime_6_0-bin + aspnetcore_6_0-bin ]; version = "2.13.0"; diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 4aa6d5c45076..71ef9beadd79 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -17,7 +17,7 @@ buildDotnetModule rec { hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; projectFile = [ "Source/Boogie.sln" ]; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index 1ec73cd14528..3b39b5c86428 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -11,7 +11,7 @@ makeWrapper, ncurses5, - dotnet-sdk_8, + dotnetCorePackages, dotnetSupport ? false, alsa-lib, @@ -33,7 +33,7 @@ let dyalogHome = "$out/lib/dyalog"; - makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnet-sdk_8}/share/dotnet"; + makeWrapperArgs = lib.optional dotnetSupport "--set DOTNET_ROOT ${dotnetCorePackages.sdk_8_0-source}/share/dotnet"; licenseUrl = "https://www.dyalog.com/uploads/documents/Developer_Software_Licence.pdf"; diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index a3b954862c1a..e51e4270535c 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -15,7 +15,7 @@ buildDotnetModule rec { hash = "sha256-hUURXPKhiI3n1BrW8IzVVmPuJyO4AxM8D5uluaJXk+4="; }; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; projectFile = "src/gei/gei.csproj"; nugetDeps = ./deps.json; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`. diff --git a/pkgs/by-name/go/godot_4/package.nix b/pkgs/by-name/go/godot_4/package.nix index bd2c9439a708..214a337d1716 100644 --- a/pkgs/by-name/go/godot_4/package.nix +++ b/pkgs/by-name/go/godot_4/package.nix @@ -4,7 +4,6 @@ buildPackages, dbus, dotnet-sdk_6, - dotnet-sdk_8, dotnetCorePackages, fetchFromGitHub, fontconfig, @@ -60,6 +59,8 @@ let arch = stdenv.hostPlatform.linuxArch; + dotnet-sdk = dotnetCorePackages.sdk_8_0-source; + attrs = finalAttrs: rec { pname = "godot4${suffix}"; version = "4.3-stable"; @@ -154,7 +155,7 @@ let ] ++ lib.optionals withWayland [ wayland-scanner ] ++ lib.optionals withMono [ - dotnet-sdk_8 + dotnet-sdk makeWrapper ]; @@ -222,10 +223,10 @@ let + lib.optionalString withMono '' cp -r bin/GodotSharp/ $out/bin/ wrapProgram $out/bin/godot4${suffix} \ - --set DOTNET_ROOT ${dotnet-sdk_8} \ + --set DOTNET_ROOT ${dotnet-sdk} \ --prefix PATH : "${ lib.makeBinPath [ - dotnet-sdk_8 + dotnet-sdk ] }" '' diff --git a/pkgs/by-name/ms/msbuild/package.nix b/pkgs/by-name/ms/msbuild/package.nix index 2df76c872264..a694aa765bf7 100644 --- a/pkgs/by-name/ms/msbuild/package.nix +++ b/pkgs/by-name/ms/msbuild/package.nix @@ -2,7 +2,7 @@ let - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; xplat = fetchurl { url = "https://github.com/mono/msbuild/releases/download/v16.9.0/mono_msbuild_6.12.0.137.zip"; diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index 216df3c3cf16..ed72a25dbf76 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -33,7 +33,7 @@ buildDotnetModule rec { inherit (combinePackages [ sdk_8_0 - sdk_6_0 + sdk_6_0-bin ]) packages targetPackages diff --git a/pkgs/by-name/ne/networkminer/package.nix b/pkgs/by-name/ne/networkminer/package.nix index ff5d917ad7ac..88918a1b1115 100644 --- a/pkgs/by-name/ne/networkminer/package.nix +++ b/pkgs/by-name/ne/networkminer/package.nix @@ -21,7 +21,7 @@ buildDotnetModule rec { sha256 = "1n2312acq5rq0jizlcfk0crslx3wgcsd836p47nk3pnapzw0cqvv"; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; nativeBuildInputs = [ unzip diff --git a/pkgs/by-name/pa/pablodraw/package.nix b/pkgs/by-name/pa/pablodraw/package.nix index 1354061a838f..7de1cf2e797f 100644 --- a/pkgs/by-name/pa/pablodraw/package.nix +++ b/pkgs/by-name/pa/pablodraw/package.nix @@ -30,8 +30,8 @@ buildDotnetModule rec { executables = [ "PabloDraw" ]; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.runtime_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_7_0-bin; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/ro/roslyn/package.nix b/pkgs/by-name/ro/roslyn/package.nix index 8811b92fbdc6..a69fa5fb2ad8 100644 --- a/pkgs/by-name/ro/roslyn/package.nix +++ b/pkgs/by-name/ro/roslyn/package.nix @@ -17,7 +17,7 @@ buildDotnetModule rec { hash = "sha256-4iXabFp0LqJ8TXOrqeD+oTAocg6ZTIfijfX3s3fMJuI="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ]; diff --git a/pkgs/by-name/ry/ryujinx/package.nix b/pkgs/by-name/ry/ryujinx/package.nix index 5ef0aa8bdb12..c5531501898a 100644 --- a/pkgs/by-name/ry/ryujinx/package.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -34,7 +34,7 @@ buildDotnetModule rec { enableParallelBuilding = false; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/so/sonarr/package.nix b/pkgs/by-name/so/sonarr/package.nix index c4a7cf65d357..77c4a82d1aae 100644 --- a/pkgs/by-name/so/sonarr/package.nix +++ b/pkgs/by-name/so/sonarr/package.nix @@ -69,8 +69,8 @@ buildDotnetModule { runtimeDeps = [ sqlite ]; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.aspnetcore_6_0-bin; doCheck = true; diff --git a/pkgs/by-name/wa/wasabibackend/package.nix b/pkgs/by-name/wa/wasabibackend/package.nix index 5b36e1d8ede5..2ab8e58e55a4 100644 --- a/pkgs/by-name/wa/wasabibackend/package.nix +++ b/pkgs/by-name/wa/wasabibackend/package.nix @@ -22,8 +22,8 @@ buildDotnetModule rec { projectFile = "WalletWasabi.Backend/WalletWasabi.Backend.csproj"; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_7_0; - dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0-bin; + dotnet-runtime = dotnetCorePackages.aspnetcore_7_0-bin; buildInputs = [(lib.getLib stdenv.cc.cc) zlib]; diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8/default.nix index 95b4c71bcf78..0c72d4b03766 100644 --- a/pkgs/development/compilers/dotnet/8/default.nix +++ b/pkgs/development/compilers/dotnet/8/default.nix @@ -5,5 +5,5 @@ releaseInfoFile = ./release-info.json; bootstrapSdkFile = ./bootstrap-sdk.nix; depsFile = ./deps.json; - fallbackTargetPackages = dotnetCorePackages.sdk_8_0.targetPackages; + fallbackTargetPackages = dotnetCorePackages.sdk_8_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/9/default.nix b/pkgs/development/compilers/dotnet/9/default.nix index 21d73761cc58..c9ec2ae9a930 100644 --- a/pkgs/development/compilers/dotnet/9/default.nix +++ b/pkgs/development/compilers/dotnet/9/default.nix @@ -6,5 +6,5 @@ bootstrapSdkFile = ./bootstrap-sdk.nix; allowPrerelease = true; depsFile = ./deps.json; - fallbackTargetPackages = dotnetCorePackages.sdk_9_0.targetPackages; + fallbackTargetPackages = dotnetCorePackages.sdk_9_0-bin.targetPackages; } diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index 6528fb3d56a1..4c9e868dc4f5 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -18,7 +18,7 @@ in assert lib.assertMsg ((builtins.length dotnetPackages) > 0) '' You must include at least one package, e.g `with dotnetCorePackages; combinePackages [ - sdk_6_0 aspnetcore_7_0 + sdk_9_0 aspnetcore_8_0 ];`''; mkWrapper "sdk" (buildEnv { name = "dotnet-combined"; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 90c474f6ae20..2d246642b8f6 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -1,6 +1,6 @@ /* How to combine packages for use in development: - dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7_0 ]; + dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_9_0 aspnetcore_8_0 ]; Hashes and urls are retrieved from: https://dotnet.microsoft.com/download/dotnet @@ -13,74 +13,115 @@ makeScopeWithSplicing', }: -makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "dotnetCorePackages"; - f = ( - self: - let - callPackage = self.callPackage; +let + pkgs = makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "dotnetCorePackages"; + f = ( + self: + let + callPackage = self.callPackage; - fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; + fetchNupkg = callPackage ../../../build-support/dotnet/fetch-nupkg { }; - buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; - buildDotnetSdk = - version: - import version { - inherit fetchNupkg; - buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); - buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); - buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) { }; + buildDotnetSdk = + version: + import version { + inherit fetchNupkg; + buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); + buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + }; + + ## Files in versions/ are generated automatically by update.sh ## + dotnet-bin = lib.mergeAttrsList ( + map buildDotnetSdk [ + ./versions/6.0.nix + ./versions/7.0.nix + ./versions/8.0.nix + ./versions/9.0.nix + ] + ); + + runtimeIdentifierMap = { + "x86_64-linux" = "linux-x64"; + "aarch64-linux" = "linux-arm64"; + "x86_64-darwin" = "osx-x64"; + "aarch64-darwin" = "osx-arm64"; + "x86_64-windows" = "win-x64"; + "i686-windows" = "win-x86"; }; - ## Files in versions/ are generated automatically by update.sh ## - dotnet_6_0 = buildDotnetSdk ./versions/6.0.nix; - dotnet_7_0 = buildDotnetSdk ./versions/7.0.nix; - dotnet_8_0 = buildDotnetSdk ./versions/8.0.nix; - dotnet_9_0 = buildDotnetSdk ./versions/9.0.nix; + in + lib.optionalAttrs config.allowAliases ( + { + # EOL + sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; + } + // dotnet-bin + ) + // lib.mapAttrs' (k: v: lib.nameValuePair "${k}-bin" v) dotnet-bin + // { + inherit callPackage fetchNupkg buildDotnetSdk; - runtimeIdentifierMap = { - "x86_64-linux" = "linux-x64"; - "aarch64-linux" = "linux-arm64"; - "x86_64-darwin" = "osx-x64"; - "aarch64-darwin" = "osx-arm64"; - "x86_64-windows" = "win-x64"; - "i686-windows" = "win-x86"; - }; + # Convert a "stdenv.hostPlatform.system" to a dotnet RID + systemToDotnetRid = + system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); - in - { - inherit callPackage fetchNupkg buildDotnetSdk; + combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { }; - # Convert a "stdenv.hostPlatform.system" to a dotnet RID - systemToDotnetRid = - system: runtimeIdentifierMap.${system} or (throw "unsupported platform ${system}"); + patchNupkgs = callPackage ./patch-nupkgs.nix { }; + nugetPackageHook = callPackage ./nuget-package-hook.nix { }; - combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) { }; + buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; + buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { }; - patchNupkgs = callPackage ./patch-nupkgs.nix { }; - nugetPackageHook = callPackage ./nuget-package-hook.nix { }; + mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; + mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; + addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; - buildDotnetModule = callPackage ../../../build-support/dotnet/build-dotnet-module { }; - buildDotnetGlobalTool = callPackage ../../../build-support/dotnet/build-dotnet-global-tool { }; - - mkNugetSource = callPackage ../../../build-support/dotnet/make-nuget-source { }; - mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { }; - addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { }; - - dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); - dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); - } - // lib.optionalAttrs config.allowAliases { - # EOL - sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_3_1 = throw "Dotnet SDK 3.1 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - sdk_5_0 = throw "Dotnet SDK 5.0 is EOL, please use 8.0 (LTS) or 9.0 (Current)"; - } - // dotnet_6_0 - // dotnet_7_0 - // dotnet_8_0 - // dotnet_9_0 + dotnet_8 = recurseIntoAttrs (callPackage ./8 { }); + dotnet_9 = recurseIntoAttrs (callPackage ./9 { }); + } + ); + }; +in +pkgs +// rec { + # use binary SDK here to avoid downgrading feature band + sdk_8_0_1xx = if !pkgs.dotnet_8.vmr.meta.broken then pkgs.dotnet_8.sdk else pkgs.sdk_8_0_1xx-bin; + # source-built SDK only exists for _1xx feature band + sdk_8_0_4xx = pkgs.callPackage ./wrapper.nix { } "sdk" ( + pkgs.sdk_8_0_4xx-bin.unwrapped.overrideAttrs (old: { + passthru = + old.passthru + // { + inherit (sdk_8_0_1xx) + runtime + aspnetcore + ; + } + # We can't use the source-built packages until ilcompiler is fixed (see vmr.nix) + // lib.optionalAttrs sdk_8_0_1xx.hasILCompiler { + inherit (sdk_8_0_1xx) + packages + targetPackages + ; + }; + }) ); + sdk_8_0 = sdk_8_0_4xx; + sdk_8_0-source = sdk_8_0_1xx; + runtime_8_0 = sdk_8_0.runtime; + aspnetcore_8_0 = sdk_8_0.aspnetcore; +} +// rec { + sdk_9_0_1xx = if !pkgs.dotnet_9.vmr.meta.broken then pkgs.dotnet_9.sdk else pkgs.sdk_9_0_1xx-bin; + sdk_9_0 = sdk_9_0_1xx; + runtime_9_0 = sdk_9_0.runtime; + aspnetcore_9_0 = sdk_9_0.aspnetcore; } diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix index 73404de17624..444b35a6ee94 100644 --- a/pkgs/development/tools/marksman/default.nix +++ b/pkgs/development/tools/marksman/default.nix @@ -28,7 +28,7 @@ buildDotnetModule rec { nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx-bin; dotnet-runtime = dotnetCorePackages.runtime_8_0; postInstall = '' diff --git a/pkgs/games/openra/build-engine.nix b/pkgs/games/openra/build-engine.nix index 85644fadef06..956ed7750e81 100644 --- a/pkgs/games/openra/build-engine.nix +++ b/pkgs/games/openra/build-engine.nix @@ -17,8 +17,8 @@ buildDotnetModule rec { nugetDeps = engine.deps; - dotnet-sdk = dotnetCorePackages.sdk_6_0; - dotnet-runtime = dotnetCorePackages.runtime_6_0; + dotnet-sdk = dotnetCorePackages.sdk_6_0-bin; + dotnet-runtime = dotnetCorePackages.runtime_6_0-bin; useAppHost = false; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 8d5b2885b867..c63e91595c0d 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -26,7 +26,15 @@ buildDotnetModule rec { dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnetInstallFlags = [ "-p:TargetFramework=net8.0" ]; + dotnetInstallFlags = [ + "--framework" + "net8.0" + ]; + + postPatch = '' + substituteInPlace ${projectFile} ${testProjectFile} \ + --replace-fail 'net8.0;net462net8.0 Date: Tue, 28 Jan 2025 01:08:29 +0000 Subject: [PATCH 13/15] azure-storage-azcopy: 10.27.1 -> 10.28.0 --- pkgs/by-name/az/azure-storage-azcopy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix index aa6b36ffabcd..168c76410192 100644 --- a/pkgs/by-name/az/azure-storage-azcopy/package.nix +++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.27.1"; + version = "10.28.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; tag = "v${version}"; - hash = "sha256-h/EiJZMX2vHn/t1FPM1ZkXf9I8LYiqK1GqkSDAlXBYY="; + hash = "sha256-dRS96M4KMEQaKYVA0fNgmmfH2JYVFbEjH8C3xA9knes="; }; subPackages = [ "." ]; - vendorHash = "sha256-7ZUQMJPYE62M47VqEwahVePC85x3TyOmADOVczUrj7w="; + vendorHash = "sha256-TwzcjhL8STH8tASTp2kQjn6bYyn/Ab+EJwvIGOBT+1A="; doCheck = false; From 7072056be606eaadee1d581a5fbde7a9357d1e8d Mon Sep 17 00:00:00 2001 From: sveith Date: Tue, 28 Jan 2025 02:28:41 +0100 Subject: [PATCH 14/15] octoprint: use octoprint from final package set as plugin build input (#370953) OctoPrint and its plugins are packaged in the form of multiple overlays, each adding one or more packages built with `buildPythonPackage`. In the NixOS module, the core `octoprint` package is then combined with zero or more of the plugin packages into one `python.withPackages` environment that is referenced by the systemd service unit. Since plugins have to use the OctoPrint modules at runtime, they receive the `octoprint` Python package as part of `propagatedBuildInputs`. However, the current implementation of the plugins overlay takes this dependency from the `super` package set, i.e., the stage preceding the plugins overlay. The use of `super` packages for dependencies is problematic here, as there may be other subsequent overlays that modify the `octoprint` package, and the `octoprint` that ends up in the final package set may not be the same that the plugin was built against. Things work out fine in the absence of any `octoprint` overrides, or if no plugins are used. Combining the two in a NixOS configuration, however, breaks the build with a collision of OctoPrint executables: error: builder for '/nix/store/7sjbm51s4j5p02s76ncrb6arzb5nwph7-python3-3.12.8-env.drv' failed with exit code 255; last 1 log lines: > error: collision between `/nix/store/rg9mixyc0qpdgn3ynrlwlp2qk9l5gh6a-python3.12-OctoPrint-1.10.3/bin/octoprint' and `/nix/store/ws68951jy8gx7q9n09xgpykkwhia82mb-Overridden-OctoPrint-1.10.2/bin/octoprint' For full logs, run 'nix-store -l /nix/store/7sjbm51s4j5p02s76ncrb6arzb5nwph7-python3-3.12.8-env.drv'. error: 1 dependencies of derivation '/nix/store/sgmn253inypq9hi722a9817w1ji8lkb8-unit-octoprint.service.drv' failed to build error: 1 dependencies of derivation '/nix/store/aydjfz8xf8s87hxc60vpnkzbclj5knj5-system-units.drv' failed to build error: 1 dependencies of derivation '/nix/store/97a3pr2v2b5yjw9g3za5rbc6blb2q808-etc.drv' failed to build The collision is between the overridden `octoprint` from the final package set and the non-overridden version that the plugins depend on (and end up propagating to their consumers). They all should be using one and the same `octoprint` package, which is the one from `self`, the final package set after applying all overrides. Modify the `buildPlugin` helper function accordingly. Fixes: https://github.com/NixOS/nixpkgs/issues/370946 --- pkgs/by-name/oc/octoprint/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix index 2dd462d4a487..feae836d56bb 100644 --- a/pkgs/by-name/oc/octoprint/plugins.nix +++ b/pkgs/by-name/oc/octoprint/plugins.nix @@ -11,7 +11,7 @@ let buildPlugin = args: self.buildPythonPackage (args // { pname = "octoprint-plugin-${args.pname}"; inherit (args) version; - propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ super.octoprint ]; + propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ self.octoprint ]; # none of the following have tests doCheck = false; }); From 96e7518e52bb1731c8f7d2f4ed2978688acea99b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 28 Jan 2025 15:10:35 +1000 Subject: [PATCH 15/15] httpx: 1.6.9 -> 1.6.10 (#377455) --- pkgs/by-name/ht/httpx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ht/httpx/package.nix b/pkgs/by-name/ht/httpx/package.nix index c1f038cf6515..108db308b234 100644 --- a/pkgs/by-name/ht/httpx/package.nix +++ b/pkgs/by-name/ht/httpx/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.6.9"; + version = "1.6.10"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; tag = "v${version}"; - hash = "sha256-fkHMtFshRNtRhsxjbYOkeL2cln84NAa01jcGKips5Kk="; + hash = "sha256-lU5LtYFnWJu4yZTqdJFqLnaAUOQ3Nc2EaNPrvTxoW3Q="; }; - vendorHash = "sha256-zTPJtuKPtsVsgMwHFjVwAh1/3DudW7TPWOMJ20nNu1I="; + vendorHash = "sha256-+m0TPKIBCnRfswrMw9+w1r/pWaRmkI+s0RRbv5X5GBo="; subPackages = [ "cmd/httpx" ];