From e93563e6a8bc0130c9122cf07406fafa96c7bafb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 4 May 2026 13:13:04 +0200 Subject: [PATCH 01/59] python3Packages.pyramid-beaker: set license source: https://github.com/Pylons/pyramid_beaker/blob/master/LICENSE.txt --- pkgs/development/python-modules/pyramid-beaker/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyramid-beaker/default.nix b/pkgs/development/python-modules/pyramid-beaker/default.nix index 4bec91496e21..bb3c620a27fc 100644 --- a/pkgs/development/python-modules/pyramid-beaker/default.nix +++ b/pkgs/development/python-modules/pyramid-beaker/default.nix @@ -33,8 +33,7 @@ buildPythonPackage rec { meta = { description = "Beaker session factory backend for Pyramid"; homepage = "https://docs.pylonsproject.org/projects/pyramid_beaker/en/latest/"; - # idk, see https://github.com/Pylons/pyramid_beaker/blob/master/LICENSE.txt - # license = licenses.mpl20; + license = lib.licenses.bsd3Modification; maintainers = [ ]; }; } From beab2cf395e54b6085768ef13c91b39852e029fa Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 4 May 2026 14:36:14 +0200 Subject: [PATCH 02/59] python3Packages.recursive-pth-loader: set license This code is part of nixpkgs so it should be under `MIT` --- .../python-modules/recursive-pth-loader/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index c5a21d488fcf..b379c6bfbc6e 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -1,4 +1,8 @@ -{ stdenv, python }: +{ + lib, + stdenv, + python, +}: stdenv.mkDerivation { pname = "python-recursive-pth-loader"; @@ -20,5 +24,6 @@ stdenv.mkDerivation { meta = { description = "Enable recursive processing of pth files anywhere in sys.path"; + license = lib.licenses.mit; }; } From 816dadc58cd2ffedd868cc84f5a6a6ad613cf255 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 4 May 2026 14:47:47 +0200 Subject: [PATCH 03/59] python3Packages.unicodecsv: set license source: https://github.com/jdunck/python-unicodecsv/blob/master/LICENSE --- pkgs/development/python-modules/unicodecsv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix index e5e6578e607a..d17af2994b96 100644 --- a/pkgs/development/python-modules/unicodecsv/default.nix +++ b/pkgs/development/python-modules/unicodecsv/default.nix @@ -21,5 +21,6 @@ buildPythonPackage rec { description = "Drop-in replacement for Python2's stdlib csv module, with unicode support"; homepage = "https://github.com/jdunck/python-unicodecsv"; maintainers = with lib.maintainers; [ koral ]; + license = lib.licenses.bsd2WithViews; }; } From d887cb9758b6fbc43d2217202be3474933a5921c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 4 May 2026 16:10:50 +0200 Subject: [PATCH 04/59] ocamlPackages.reason-native.src: set license source: https://github.com/reasonml/reason-native/blob/master/LICENSE --- pkgs/development/ocaml-modules/reason-native/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/reason-native/default.nix b/pkgs/development/ocaml-modules/reason-native/default.nix index 46df185ce87c..fbffaab4ae9a 100644 --- a/pkgs/development/ocaml-modules/reason-native/default.nix +++ b/pkgs/development/ocaml-modules/reason-native/default.nix @@ -29,6 +29,9 @@ lib.makeScope newScope (self: { # When updating this make sure to also update the `version` above rev = "20b1997b6451d9715dfdbeec86a9d274c7430ed8"; hash = "sha256-96Ucq70eSy6pqh5ne9xoODWe/nPuriZnFAdx0OkLVCs="; + meta = { + license = lib.licenses.mit; + }; }; cli = self.callPackage ./cli.nix { }; From 96b54b19433a2dfb09430a24e22a11dab30fd9e8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:22:41 +0200 Subject: [PATCH 05/59] quill-qr: set license reason: could not find a license in the source code --- pkgs/by-name/qu/quill-qr/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/qu/quill-qr/package.nix b/pkgs/by-name/qu/quill-qr/package.nix index 79b0c16cb4c0..2ede6e9feee2 100644 --- a/pkgs/by-name/qu/quill-qr/package.nix +++ b/pkgs/by-name/qu/quill-qr/package.nix @@ -45,5 +45,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/colonelpanic8/quill-qr"; maintainers = with lib.maintainers; [ imalison ]; platforms = with lib.platforms; linux; + license = lib.licenses.unfree; }; } From 748036a3df1a94f5f97dd15b6af0dcae24f126d6 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:27:46 +0200 Subject: [PATCH 06/59] replace: set license reason: could not find a license in the source code --- pkgs/by-name/re/replace/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/re/replace/package.nix b/pkgs/by-name/re/replace/package.nix index 0030d562f921..1d8550f4870f 100644 --- a/pkgs/by-name/re/replace/package.nix +++ b/pkgs/by-name/re/replace/package.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://replace.richardlloyd.org.uk/"; mainProgram = "replace-literal"; platforms = lib.platforms.unix; + license = lib.licenses.unfree; }; }) From ab481c5c42c962c25f847a42b1b720f4ad1e414e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:35:10 +0200 Subject: [PATCH 07/59] rofi-menugen: set license reason: could not find any license in the source code --- pkgs/by-name/ro/rofi-menugen/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ro/rofi-menugen/package.nix b/pkgs/by-name/ro/rofi-menugen/package.nix index 2b5ac7ed0281..55fd7ac1f2a7 100644 --- a/pkgs/by-name/ro/rofi-menugen/package.nix +++ b/pkgs/by-name/ro/rofi-menugen/package.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation { homepage = "https://github.com/octotep/menugen"; maintainers = [ ]; platforms = lib.platforms.all; + license = lib.licenses.unfree; }; } From 629ef0430dada7da0e16f7223aed3b2f5fc70c38 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:36:51 +0200 Subject: [PATCH 08/59] rofi-power-menu: set license source: https://github.com/jluttine/rofi-power-menu/blob/master/COPYING --- pkgs/by-name/ro/rofi-power-menu/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ro/rofi-power-menu/package.nix b/pkgs/by-name/ro/rofi-power-menu/package.nix index 1d1219cc31f7..1b149a5b785c 100644 --- a/pkgs/by-name/ro/rofi-power-menu/package.nix +++ b/pkgs/by-name/ro/rofi-power-menu/package.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ ikervagyok ]; platforms = lib.platforms.linux; mainProgram = "rofi-power-menu"; + license = lib.licenses.mit; }; }) From a352e32786fb99922864944e1503e185a68a086c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:47:03 +0200 Subject: [PATCH 09/59] rt: set license source: https://github.com/bestpractical/rt/blob/stable/COPYING --- pkgs/by-name/rt/rt/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/rt/rt/package.nix b/pkgs/by-name/rt/rt/package.nix index 71e4ab7b5841..1acee7c45088 100644 --- a/pkgs/by-name/rt/rt/package.nix +++ b/pkgs/by-name/rt/rt/package.nix @@ -177,5 +177,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { platforms = lib.platforms.unix; + license = lib.licenses.gpl2Only; }; }) From 0bedef69d94798619f3246aad0f29889a3b9d785 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:54:25 +0200 Subject: [PATCH 10/59] rubik: set license source: https://fonts.google.com/specimen/Rubik/license --- pkgs/by-name/ru/rubik/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ru/rubik/package.nix b/pkgs/by-name/ru/rubik/package.nix index 67ac23964f55..2cfa62c3b8d5 100644 --- a/pkgs/by-name/ru/rubik/package.nix +++ b/pkgs/by-name/ru/rubik/package.nix @@ -46,5 +46,6 @@ stdenvNoCC.mkDerivation { glyphs were improved, and glyph set was expanded to GF Cyrillic Plus. ''; platforms = lib.platforms.all; + license = lib.licenses.ofl; }; } From 304be79271cf70a42db5da3cf12ac33de72e4b3b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 20:00:11 +0200 Subject: [PATCH 11/59] setconf: set license source: https://github.com/xyproto/setconf/blob/main/COPYING --- pkgs/by-name/se/setconf/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/se/setconf/package.nix b/pkgs/by-name/se/setconf/package.nix index 17acd52dcad0..275adf7f4b41 100644 --- a/pkgs/by-name/se/setconf/package.nix +++ b/pkgs/by-name/se/setconf/package.nix @@ -26,6 +26,7 @@ let changelog = "https://github.com/xyproto/setconf/releases/tag/${self.src.rev}"; mainProgram = "setconf"; maintainers = [ ]; + license = lib.licenses.gpl2Only; }; }; in From b5702359f00e0274bd7773bab40564d97a475beb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 20:02:59 +0200 Subject: [PATCH 12/59] sqlboiler-crdb: set license reason: could not find a license in the source code --- pkgs/by-name/sq/sqlboiler-crdb/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sq/sqlboiler-crdb/package.nix b/pkgs/by-name/sq/sqlboiler-crdb/package.nix index e3fdb1e00d7a..53e22d98c956 100644 --- a/pkgs/by-name/sq/sqlboiler-crdb/package.nix +++ b/pkgs/by-name/sq/sqlboiler-crdb/package.nix @@ -25,5 +25,6 @@ buildGoModule { homepage = "https://github.com/glerchundi/sqlboiler-crdb/"; maintainers = with lib.maintainers; [ dgollings ]; platforms = lib.platforms.unix; + license = lib.licenses.unfree; }; } From 0c86c139b1561781fa96ae6526e56953294d1a61 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 20:18:53 +0200 Subject: [PATCH 13/59] tesh: set license source: https://github.com/OceanSprint/tesh/blob/main/LICENSE --- pkgs/by-name/te/tesh/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/te/tesh/package.nix b/pkgs/by-name/te/tesh/package.nix index dc969dd93b8d..9a6eae86f6ec 100644 --- a/pkgs/by-name/te/tesh/package.nix +++ b/pkgs/by-name/te/tesh/package.nix @@ -1,4 +1,8 @@ -{ python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: let version = "0.3.2"; @@ -23,4 +27,8 @@ python3Packages.buildPythonPackage rec { pexpect distutils ]; + + meta = { + license = lib.licenses.mit; + }; } From ce5e5116a00c234decb2098ddcfa2fa62243ae57 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 6 May 2026 10:32:46 +0200 Subject: [PATCH 14/59] zsh-autoenv: set license reason: no license found in source code --- pkgs/by-name/zs/zsh-autoenv/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/zs/zsh-autoenv/package.nix b/pkgs/by-name/zs/zsh-autoenv/package.nix index 63d7bc8b9484..09bdf8afca26 100644 --- a/pkgs/by-name/zs/zsh-autoenv/package.nix +++ b/pkgs/by-name/zs/zsh-autoenv/package.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation { homepage = "https://github.com/Tarrasch/zsh-autoenv"; mainProgram = "zsh-autoenv-share"; platforms = lib.platforms.all; + license = lib.licenses.unfree; }; } From 257689de3d626085b008ecc0c05d940acf7c4e27 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 6 May 2026 11:48:00 +0200 Subject: [PATCH 15/59] mailutils: fix portability issue affecting musl --- pkgs/by-name/ma/mailutils/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ma/mailutils/package.nix b/pkgs/by-name/ma/mailutils/package.nix index 33011d4ddf08..493c25cf05b0 100644 --- a/pkgs/by-name/ma/mailutils/package.nix +++ b/pkgs/by-name/ma/mailutils/package.nix @@ -92,6 +92,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/mailutils/-/raw/87c3614083260f52dd1222e872a1836f0ff9abe1/fix-build.patch"; hash = "sha256-RN62l5mYqtViEjXpAlQKWhFez1TPynRMj/1nvZkq5Gs="; }) + # Fix for non-portable assumptions causing test failures on musl + (fetchpatch { + name = "portability.patch"; + url = "https://cgit.git.savannah.gnu.org/cgit/mailutils.git/patch/?id=6e038f04d575731cf90a44cf0114e485a9827a26"; + hash = "sha256-kamIiQty+/PEB9gC4tPsEMzz1GMGuZAe+DXqjdTeg70="; + }) ]; enableParallelBuilding = true; From f72ac56df28d638720d76b98e845e3855a2031b8 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 6 May 2026 09:27:18 -0300 Subject: [PATCH 16/59] dotnet: fix indentation in update scripts --- .../compilers/dotnet/binary/update.sh | 522 +++++++++--------- .../compilers/dotnet/source/update.sh | 238 ++++---- 2 files changed, 380 insertions(+), 380 deletions(-) diff --git a/pkgs/development/compilers/dotnet/binary/update.sh b/pkgs/development/compilers/dotnet/binary/update.sh index 116fed9c9aad..63ad985e965f 100755 --- a/pkgs/development/compilers/dotnet/binary/update.sh +++ b/pkgs/development/compilers/dotnet/binary/update.sh @@ -10,94 +10,94 @@ trap 'exit 1' ERR rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) release () { - local content="$1" - local version="$2" + local content="$1" + local version="$2" - jq -er '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" + jq -er '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" } release_files () { - local release="$1" - local expr="$2" + local release="$1" + local expr="$2" - jq -er '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" + jq -er '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" } release_platform_attr () { - local release_files="$1" - local platform="$2" - local attr="$3" + local release_files="$1" + local platform="$2" + local attr="$3" - jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("-composite-") or contains("-pack-") | not)) | ."'"$attr"'"' <<< "$release_files" + jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("-composite-") or contains("-pack-") | not)) | ."'"$attr"'"' <<< "$release_files" } platform_sources () { - local release_files="$1" + local release_files="$1" - echo "srcs = {" - for rid in "${rids[@]}"; do - local url hash + echo "srcs = {" + for rid in "${rids[@]}"; do + local url hash - url=$(release_platform_attr "$release_files" "$rid" url) - hash=$(release_platform_attr "$release_files" "$rid" hash) + url=$(release_platform_attr "$release_files" "$rid" url) + hash=$(release_platform_attr "$release_files" "$rid" hash) - [[ -z "$url" || -z "$hash" ]] && continue + [[ -z "$url" || -z "$hash" ]] && continue - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") - echo " $rid = { + echo " $rid = { url = \"$url\"; hash = \"$hash\"; };" - done - echo " };" + done + echo " };" } nuget_index="$(curl -fsSL "https://api.nuget.org/v3/index.json")" get_nuget_resource() { - jq -er '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index" + jq -er '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index" } nuget_package_base_url="$(get_nuget_resource "PackageBaseAddress/3.0.0")" nuget_registration_base_url="$(get_nuget_resource "RegistrationsBaseUrl/3.6.0")" generate_package_list() { - local version="$1" indent="$2" - shift 2 - local pkgs=( "$@" ) pkg url hash catalog_url catalog hash_algorithm + local version="$1" indent="$2" + shift 2 + local pkgs=( "$@" ) pkg url hash catalog_url catalog hash_algorithm - for pkg in "${pkgs[@]}"; do - url=${nuget_package_base_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg + for pkg in "${pkgs[@]}"; do + url=${nuget_package_base_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg - if hash=$(curl -s --head "$url" -o /dev/null -w '%header{x-ms-meta-sha512}') && [[ -n "$hash" ]]; then - # Undocumented fast path for nuget.org - # https://github.com/NuGet/NuGetGallery/issues/9433#issuecomment-1472286080 - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") - elif { - catalog_url=$(curl -sL --compressed "${nuget_registration_base_url}${pkg,,}/${version,,}.json" | jq -r ".catalogEntry") && [[ -n "$catalog_url" ]] && - catalog=$(curl -sL "$catalog_url") && [[ -n "$catalog" ]] && - hash_algorithm="$(jq -er '.packageHashAlgorithm' <<<"$catalog")"&& [[ -n "$hash_algorithm" ]] && - hash=$(jq -er '.packageHash' <<<"$catalog") && [[ -n "$hash" ]] - }; then - # Documented but slower path (requires 2 requests) - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo "${hash_algorithm,,}" "$hash") - elif hash=$(nix-prefetch-url "$url" --type sha512); then - # Fallback to downloading and hashing locally - echo "Failed to fetch hash from nuget for $url, falling back to downloading locally" >&2 - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") - else - echo "Failed to fetch hash for $url" >&2 - exit 1 - fi + if hash=$(curl -s --head "$url" -o /dev/null -w '%header{x-ms-meta-sha512}') && [[ -n "$hash" ]]; then + # Undocumented fast path for nuget.org + # https://github.com/NuGet/NuGetGallery/issues/9433#issuecomment-1472286080 + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") + elif { + catalog_url=$(curl -sL --compressed "${nuget_registration_base_url}${pkg,,}/${version,,}.json" | jq -r ".catalogEntry") && [[ -n "$catalog_url" ]] && + catalog=$(curl -sL "$catalog_url") && [[ -n "$catalog" ]] && + hash_algorithm="$(jq -er '.packageHashAlgorithm' <<<"$catalog")"&& [[ -n "$hash_algorithm" ]] && + hash=$(jq -er '.packageHash' <<<"$catalog") && [[ -n "$hash" ]] + }; then + # Documented but slower path (requires 2 requests) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo "${hash_algorithm,,}" "$hash") + elif hash=$(nix-prefetch-url "$url" --type sha512); then + # Fallback to downloading and hashing locally + echo "Failed to fetch hash from nuget for $url, falling back to downloading locally" >&2 + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") + else + echo "Failed to fetch hash for $url" >&2 + exit 1 + fi - echo "$indent(fetchNupkg { pname = \"${pkg}\"; version = \"${version}\"; hash = \"${hash}\"; })" - done + echo "$indent(fetchNupkg { pname = \"${pkg}\"; version = \"${version}\"; hash = \"${hash}\"; })" + done } versionAtLeast () { - local cur_version=$1 min_version=$2 - printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC + local cur_version=$1 min_version=$2 + printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC } # These packages are implicitly references by the build process, @@ -123,120 +123,120 @@ versionAtLeast () { # This should not happend in minor or bugfix updates, but probably happens # with every new major .NET release. aspnetcore_packages () { - local version=$1 - local pkgs=( - Microsoft.AspNetCore.App.Ref + local version=$1 + local pkgs=( + Microsoft.AspNetCore.App.Ref + ) + + if versionAtLeast "$version" 10; then + pkgs+=( + Microsoft.AspNetCore.App.Internal.Assets ) + fi - if versionAtLeast "$version" 10; then - pkgs+=( - Microsoft.AspNetCore.App.Internal.Assets - ) - fi - - generate_package_list "$version" ' ' "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } aspnetcore_target_packages () { - local version=$1 - local rid=$2 - local pkgs=( - "Microsoft.AspNetCore.App.Runtime.$rid" - ) + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.AspNetCore.App.Runtime.$rid" + ) - generate_package_list "$version" ' ' "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } netcore_packages () { - local version=$1 - local pkgs=( - Microsoft.NETCore.DotNetAppHost - Microsoft.NETCore.App.Ref + local version=$1 + local pkgs=( + Microsoft.NETCore.DotNetAppHost + Microsoft.NETCore.App.Ref + ) + + if ! versionAtLeast "$version" 9; then + pkgs+=( + Microsoft.NETCore.DotNetHost + Microsoft.NETCore.DotNetHostPolicy + Microsoft.NETCore.DotNetHostResolver ) + fi - if ! versionAtLeast "$version" 9; then - pkgs+=( - Microsoft.NETCore.DotNetHost - Microsoft.NETCore.DotNetHostPolicy - Microsoft.NETCore.DotNetHostResolver - ) - fi + if versionAtLeast "$version" 7; then + pkgs+=( + Microsoft.DotNet.ILCompiler + ) + fi - if versionAtLeast "$version" 7; then - pkgs+=( - Microsoft.DotNet.ILCompiler - ) - fi + if versionAtLeast "$version" 8; then + pkgs+=( + Microsoft.NET.ILLink.Tasks + ) + fi - if versionAtLeast "$version" 8; then - pkgs+=( - Microsoft.NET.ILLink.Tasks - ) - fi - - generate_package_list "$version" ' ' "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } netcore_host_packages () { - local version=$1 - local rid=$2 - local pkgs=( - "Microsoft.NETCore.App.Crossgen2.$rid" + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.NETCore.App.Crossgen2.$rid" + ) + + local min_ilcompiler= + case "$rid" in + linux-musl-arm) ;; + linux-arm) ;; + win-x86) ;; + osx-arm64) min_ilcompiler=8 ;; + *) min_ilcompiler=7 ;; + esac + + if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then + pkgs+=( + "runtime.$rid.Microsoft.DotNet.ILCompiler" ) + fi - local min_ilcompiler= - case "$rid" in - linux-musl-arm) ;; - linux-arm) ;; - win-x86) ;; - osx-arm64) min_ilcompiler=8 ;; - *) min_ilcompiler=7 ;; - esac - - if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then - pkgs+=( - "runtime.$rid.Microsoft.DotNet.ILCompiler" - ) - fi - - generate_package_list "$version" ' ' "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } netcore_target_packages () { - local version=$1 - local rid=$2 - local pkgs=( - "Microsoft.NETCore.App.Host.$rid" - "Microsoft.NETCore.App.Runtime.$rid" - "runtime.$rid.Microsoft.NETCore.DotNetAppHost" + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.NETCore.App.Host.$rid" + "Microsoft.NETCore.App.Runtime.$rid" + "runtime.$rid.Microsoft.NETCore.DotNetAppHost" + ) + + if ! versionAtLeast "$version" 9; then + pkgs+=( + "runtime.$rid.Microsoft.NETCore.DotNetHost" + "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" + "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" ) + case "$rid" in + linux-musl-arm*) ;; + win-arm64) ;; + *) pkgs+=( + "Microsoft.NETCore.App.Runtime.Mono.$rid" + ) ;; + esac + fi - if ! versionAtLeast "$version" 9; then - pkgs+=( - "runtime.$rid.Microsoft.NETCore.DotNetHost" - "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" - "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" - ) - case "$rid" in - linux-musl-arm*) ;; - win-arm64) ;; - *) pkgs+=( - "Microsoft.NETCore.App.Runtime.Mono.$rid" - ) ;; - esac - fi + if versionAtLeast "$version" 10; then + pkgs+=( + "Microsoft.NETCore.App.Runtime.NativeAOT.$rid" + ) + fi - if versionAtLeast "$version" 10; then - pkgs+=( - "Microsoft.NETCore.App.Runtime.NativeAOT.$rid" - ) - fi - - generate_package_list "$version" ' ' "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } usage () { - echo "Usage: $pname [[--sdk] [-o output] sem-version] ... + echo "Usage: $pname [[--sdk] [-o output] sem-version] ... Get updated dotnet src (platform - url & sha512) expressions for specified versions Exit codes: @@ -251,61 +251,61 @@ Examples: } update() { - local -r sem_version=$1 sdk=$2 - local output=$3 + local -r sem_version=$1 sdk=$2 + local output=$3 - local patch_specified=false - # Check if a patch was specified as an argument. - # If so, generate file for the specific version. - # If only x.y version was provided, get the latest patch - # version of the given x.y version. - if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then - patch_specified=true - elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then - usage - return 1 - fi + local patch_specified=false + # Check if a patch was specified as an argument. + # If so, generate file for the specific version. + # If only x.y version was provided, get the latest patch + # version of the given x.y version. + if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then + patch_specified=true + elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then + usage + return 1 + fi - : ${output:="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"/../$sem_version/releases.nix} - echo "Generating $output" + : ${output:="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"/../$sem_version/releases.nix} + echo "Generating $output" - # Make sure the x.y version is properly passed to .NET release metadata url. - # Then get the json file and parse it to find the latest patch release. - local major_minor content major_minor_patch - major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") - content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) - if [[ -n $sdk ]]; then - trap '' ERR - major_minor_patch=$( - jq -er --arg version "$sem_version" ' + # Make sure the x.y version is properly passed to .NET release metadata url. + # Then get the json file and parse it to find the latest patch release. + local major_minor content major_minor_patch + major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") + content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) + if [[ -n $sdk ]]; then + trap '' ERR + major_minor_patch=$( + jq -er --arg version "$sem_version" ' .releases[] | select(.sdks[].version == $version) | ."release-version"' <<< "$content" || if [[ $? == 4 ]]; then exit 2; else exit 1; fi) - trap 'exit 1' ERR - else - major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -er '."latest-release"' <<< "$content") - fi - local major_minor_underscore=${major_minor/./_} + trap 'exit 1' ERR + else + major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -er '."latest-release"' <<< "$content") + fi + local major_minor_underscore=${major_minor/./_} - local release_content aspnetcore_version runtime_version - local -a sdk_versions + local release_content aspnetcore_version runtime_version + local -a sdk_versions - release_content=$(release "$content" "$major_minor_patch") - aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content") - runtime_version=$(jq -er '.runtime.version' <<< "$release_content") + release_content=$(release "$content" "$major_minor_patch") + aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content") + runtime_version=$(jq -er '.runtime.version' <<< "$release_content") - if [[ -n $sdk ]]; then - sdk_versions=("$sem_version") - else - mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn) - fi + if [[ -n $sdk ]]; then + sdk_versions=("$sem_version") + else + mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn) + fi - # If patch was not specified, check if the package is already the latest version - # If it is, exit early - if [ "$patch_specified" == false ] && [ -f "$output" ]; then - local -a versions - IFS= readarray -d '' versions < <( - nix-instantiate --eval --json -E "{ output }: with (import output { + # If patch was not specified, check if the package is already the latest version + # If it is, exit early + if [ "$patch_specified" == false ] && [ -f "$output" ]; then + local -a versions + IFS= readarray -d '' versions < <( + nix-instantiate --eval --json -E "{ output }: with (import output { buildAspNetCore = { ... }: {}; buildNetSdk = { version, ... }: { inherit version; }; buildNetRuntime = { version, ... }: { inherit version; }; @@ -314,54 +314,54 @@ update() { runtime_${major_minor_underscore}.version sdk_${major_minor_underscore}.version ]" --argstr output "$output" | jq -e --raw-output0 .[]) - if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then - echo "Nothing to update." - return - fi + if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then + echo "Nothing to update." + return fi + fi - local aspnetcore_files runtime_files - aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" - runtime_files="$(release_files "$release_content" .runtime)" + local aspnetcore_files runtime_files + aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" + runtime_files="$(release_files "$release_content" .runtime)" - local channel_version support_phase - channel_version=$(jq -er '."channel-version"' <<< "$content") - support_phase=$(jq -er '."support-phase"' <<< "$content") + local channel_version support_phase + channel_version=$(jq -er '."channel-version"' <<< "$content") + support_phase=$(jq -er '."support-phase"' <<< "$content") - local aspnetcore_sources runtime_sources - aspnetcore_sources="$(platform_sources "$aspnetcore_files")" - runtime_sources="$(platform_sources "$runtime_files")" + local aspnetcore_sources runtime_sources + aspnetcore_sources="$(platform_sources "$aspnetcore_files")" + runtime_sources="$(platform_sources "$runtime_files")" - result=$(mktemp -t dotnet-XXXXXX.nix) - trap "rm -f $result" TERM INT EXIT + result=$(mktemp -t dotnet-XXXXXX.nix) + trap "rm -f $result" TERM INT EXIT - ( - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + ( + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v$channel_version ($support_phase) let commonPackages = [" - aspnetcore_packages "${aspnetcore_version}" - netcore_packages "${runtime_version}" - echo " ]; + aspnetcore_packages "${aspnetcore_version}" + netcore_packages "${runtime_version}" + echo " ]; hostPackages = {" - for rid in "${rids[@]}"; do - echo " $rid = [" - netcore_host_packages "${runtime_version}" "$rid" - echo " ];" - done - echo " }; + for rid in "${rids[@]}"; do + echo " $rid = [" + netcore_host_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; targetPackages = {" - for rid in "${rids[@]}"; do - echo " $rid = [" - aspnetcore_target_packages "${aspnetcore_version}" "$rid" - netcore_target_packages "${runtime_version}" "$rid" - echo " ];" - done - echo " }; + for rid in "${rids[@]}"; do + echo " $rid = [" + aspnetcore_target_packages "${aspnetcore_version}" "$rid" + netcore_target_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; in rec { release_$major_minor_underscore = \"$major_minor_patch\"; @@ -376,22 +376,22 @@ in rec { $runtime_sources };" - local -A feature_bands - unset latest_sdk + local -A feature_bands + unset latest_sdk - for sdk_version in "${sdk_versions[@]}"; do - local sdk_base_version=${sdk_version%-*} - local feature_band=${sdk_base_version:0:-2}xx - # sometimes one release has e.g. both 8.0.202 and 8.0.203 - [[ ! ${feature_bands[$feature_band]+true} ]] || continue - feature_bands[$feature_band]=$sdk_version - local sdk_files sdk_sources - sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" - sdk_sources="$(platform_sources "$sdk_files")" - local sdk_attrname=sdk_${feature_band//./_} - [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname + for sdk_version in "${sdk_versions[@]}"; do + local sdk_base_version=${sdk_version%-*} + local feature_band=${sdk_base_version:0:-2}xx + # sometimes one release has e.g. both 8.0.202 and 8.0.203 + [[ ! ${feature_bands[$feature_band]+true} ]] || continue + feature_bands[$feature_band]=$sdk_version + local sdk_files sdk_sources + sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" + sdk_sources="$(platform_sources "$sdk_files")" + local sdk_attrname=sdk_${feature_band//./_} + [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname - echo " + echo " $sdk_attrname = buildNetSdk { version = \"${sdk_version}\"; $sdk_sources @@ -399,49 +399,49 @@ in rec { runtime = runtime_$major_minor_underscore; aspnetcore = aspnetcore_$major_minor_underscore; };" - done + done - if [[ -n $sdk ]]; then - echo " + if [[ -n $sdk ]]; then + echo " sdk = sdk_$major_minor_underscore; " - fi + fi - echo " + echo " sdk_$major_minor_underscore = $latest_sdk; }" - )> "$result" + )> "$result" - nixfmt "$result" - mkdir -p "$(dirname -- "$output")" - cp "$result" "$output" - echo "Generated $output" + nixfmt "$result" + mkdir -p "$(dirname -- "$output")" + cp "$result" "$output" + echo "Generated $output" } main () { - local pname sdk output - pname=$(basename "$0") + local pname sdk output + pname=$(basename "$0") - sdk= - output= + sdk= + output= - while [ $# -gt 0 ]; do - case $1 in - --sdk) - shift - sdk=1 - ;; - -o) - shift - output=$1 - shift - ;; - *) - update "$1" "$sdk" "$output" - shift - ;; - esac - done + while [ $# -gt 0 ]; do + case $1 in + --sdk) + shift + sdk=1 + ;; + -o) + shift + output=$1 + shift + ;; + *) + update "$1" "$sdk" "$output" + shift + ;; + esac + done } main "$@" diff --git a/pkgs/development/compilers/dotnet/source/update.sh b/pkgs/development/compilers/dotnet/source/update.sh index fc78d31aab08..585f45e71f19 100755 --- a/pkgs/development/compilers/dotnet/source/update.sh +++ b/pkgs/development/compilers/dotnet/source/update.sh @@ -3,30 +3,30 @@ set -euo pipefail updateSdk() { - tag=${1-} + tag=${1-} - if [[ -n $tag ]]; then - query=$(cat <&2 echo "release is already $tagName" - exit - } + [[ ! -e "$output"/release.json || $(jq -r .tag "$output"/release.json) != "$tagName" ]] || { + >&2 echo "release is already $tagName" + exit + } - # TMPDIR might be really long, which breaks gpg - tmp="$(TMPDIR=/tmp mktemp -d)" - trap 'rm -rf "$tmp"' EXIT + # TMPDIR might be really long, which breaks gpg + tmp="$(TMPDIR=/tmp mktemp -d)" + trap 'rm -rf "$tmp"' EXIT - cd "$tmp" + cd "$tmp" - curl -fsSL "$releaseUrl" -o release.json + curl -fsSL "$releaseUrl" -o release.json - tarballUrl=https://github.com/dotnet/dotnet/archive/refs/tags/$tagName.tar.gz + tarballUrl=https://github.com/dotnet/dotnet/archive/refs/tags/$tagName.tar.gz - mapfile -t prefetch < <(nix-prefetch-url --print-path "$tarballUrl") - tarballHash=$(nix-hash --to-sri --type sha256 "${prefetch[0]}") - tarball=${prefetch[1]} + mapfile -t prefetch < <(nix-prefetch-url --print-path "$tarballUrl") + tarballHash=$(nix-hash --to-sri --type sha256 "${prefetch[0]}") + tarball=${prefetch[1]} - # recent dotnet 10 releases don't have a signature for the github tarball - if [[ ! $sigUrl = */dotnet-source-* ]]; then - curl -fssL "$sigUrl" -o release.sig - curl -fssLO https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc - echo '17aebc401e7999dd0642fa06d23780eba15bd916ebb118454f34db5c85f7194a release-key-2023.asc' | - sha256sum -c + # recent dotnet 10 releases don't have a signature for the github tarball + if [[ ! $sigUrl = */dotnet-source-* ]]; then + curl -fssL "$sigUrl" -o release.sig + curl -fssLO https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc + echo '17aebc401e7999dd0642fa06d23780eba15bd916ebb118454f34db5c85f7194a release-key-2023.asc' | + sha256sum -c - ( - export GNUPGHOME=$PWD/.gnupg - mkdir -m 700 -p $GNUPGHOME - trap 'gpgconf --kill all' EXIT - gpg --no-autostart --batch --import release-key-2023.asc - gpg --no-autostart --batch --verify release.sig "$tarball" - ) - fi + ( + export GNUPGHOME=$PWD/.gnupg + mkdir -m 700 -p $GNUPGHOME + trap 'gpgconf --kill all' EXIT + gpg --no-autostart --batch --import release-key-2023.asc + gpg --no-autostart --batch --verify release.sig "$tarball" + ) + fi - tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh - artifactsVersion=$(xq -r '.Project.PropertyGroup | + tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh + artifactsVersion=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsVersion)) | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) - if [[ "$artifactsVersion" != "" ]]; then - artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh) - eval "$artifactVar" + if [[ "$artifactsVersion" != "" ]]; then + artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh) + eval "$artifactVar" - artifactsFile=Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz + artifactsFile=Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz - dotnetBuildUrl=https://builds.dotnet.microsoft.com/ + dotnetBuildUrl=https://builds.dotnet.microsoft.com/ - if [[ $major -ge 10 ]]; then - dotnetBuildUrl+=dotnet/source-build - else - dotnetBuildUrl+=source-built-artifacts/assets - fi + if [[ $major -ge 10 ]]; then + dotnetBuildUrl+=dotnet/source-build + else + dotnetBuildUrl+=source-built-artifacts/assets + fi - artifactsUrl=$dotnetBuildUrl/$artifactsFile + artifactsUrl=$dotnetBuildUrl/$artifactsFile - curl -fsSL "$artifactsUrl" --head || { - [[ $? == 22 ]] - artifactsUrl=https://ci.dot.net/public/source-build/$artifactsFile - } - else - artifactsUrl=$(xq -r '.Project.PropertyGroup | + curl -fsSL "$artifactsUrl" --head || { + [[ $? == 22 ]] + artifactsUrl=https://ci.dot.net/public/source-build/$artifactsFile + } + else + artifactsUrl=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsUrl)) | .[] | .PrivateSourceBuiltArtifactsUrl' eng/Versions.props) - artifactsUrl="${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}" - fi + artifactsUrl="${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}" + fi - artifactsHash=$(nix-prefetch-url "$artifactsUrl") - artifactsHash=$(nix-hash --to-sri --type sha256 "$artifactsHash") + artifactsHash=$(nix-prefetch-url "$artifactsUrl") + artifactsHash=$(nix-hash --to-sri --type sha256 "$artifactsHash") - sdkVersion=$(jq -er .tools.dotnet global.json) + sdkVersion=$(jq -er .tools.dotnet global.json) - # below needs to be run in nixpkgs because toOutputPath uses relative paths - cd - + # below needs to be run in nixpkgs because toOutputPath uses relative paths + cd - - cp "$tmp"/release.json "$output" + cp "$tmp"/release.json "$output" - jq --null-input \ - --arg _0 "$tarballHash" \ - --arg _1 "$artifactsUrl" \ - --arg _2 "$artifactsHash" \ - '{ - "tarballHash": $_0, - "artifactsUrl": $_1, - "artifactsHash": $_2, - }' > "$output"/release-info.json + jq --null-input \ + --arg _0 "$tarballHash" \ + --arg _1 "$artifactsUrl" \ + --arg _2 "$artifactsHash" \ + '{ + "tarballHash": $_0, + "artifactsUrl": $_1, + "artifactsHash": $_2, + }' > "$output"/release-info.json - if [[ $band == 1xx ]]; then - getBootstrap() { - pkgs/development/compilers/dotnet/binary/update.sh \ - -o "$output"/bootstrap-sdk.nix --sdk "$1" >&2 - } + if [[ $band == 1xx ]]; then + getBootstrap() { + pkgs/development/compilers/dotnet/binary/update.sh \ + -o "$output"/bootstrap-sdk.nix --sdk "$1" >&2 + } - getBootstrap "$sdkVersion" || if [[ $? == 2 ]]; then - >&2 echo "WARNING: bootstrap sdk missing, attempting to bootstrap with self" - getBootstrap "$(jq -er .sdkVersion "$tmp"/release.json)" - else - exit 1 - fi + getBootstrap "$sdkVersion" || if [[ $? == 2 ]]; then + >&2 echo "WARNING: bootstrap sdk missing, attempting to bootstrap with self" + getBootstrap "$(jq -er .sdkVersion "$tmp"/release.json)" + else + exit 1 + fi - $(nix-build -A dotnetCorePackages.dotnet_$major.vmr.fetch-deps --no-out-link) >&2 - fi - ) + $(nix-build -A dotnetCorePackages.dotnet_$major.vmr.fetch-deps --no-out-link) >&2 + fi + ) } while [ $# -gt 0 ]; do - channel="$1" - shift + channel="$1" + shift - major="${channel%.*}" + major="${channel%.*}" - if [[ $major -lt 8 ]]; then - >&2 echo "dotnet $major has no vmr" + if [[ $major -lt 8 ]]; then + >&2 echo "dotnet $major has no vmr" + continue + fi + + curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$channel"/releases.json | + jq -r '.releases[0].sdks.[] | .version' | { + while read sdk; do + if [[ $major -lt 10 && $sdk != *.*.1* ]]; then + >&2 echo "sdk $sdk has no vmr" continue - fi + fi - curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$channel"/releases.json | - jq -r '.releases[0].sdks.[] | .version' | { - while read sdk; do - if [[ $major -lt 10 && $sdk != *.*.1* ]]; then - >&2 echo "sdk $sdk has no vmr" - continue - fi - - updateSdk v"$sdk" - done - } + updateSdk v"$sdk" + done + } done From 5a2c4a386e482fe0a217d4a29aec9fcc21b60cac Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 8 May 2026 15:12:55 -0300 Subject: [PATCH 17/59] dotnet: don't evaluate missing packages This allows the update scripts to work when the generated files have been removed. --- pkgs/development/compilers/dotnet/default.nix | 2 -- pkgs/development/compilers/dotnet/dotnet.nix | 9 +++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index b0629746d176..3eadb90bfa24 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -84,12 +84,10 @@ makeScopeWithSplicing' { let dotnet_6 = callWithUtils ./dotnet.nix { channel = "6.0"; - withVMR = false; }; dotnet_7 = callWithUtils ./dotnet.nix { channel = "7.0"; - withVMR = false; }; dotnet_8 = callWithUtils ./dotnet.nix { diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix index b484ef3e3ef4..fd9783f9d980 100644 --- a/pkgs/development/compilers/dotnet/dotnet.nix +++ b/pkgs/development/compilers/dotnet/dotnet.nix @@ -5,12 +5,17 @@ channel, dir ? ./. + ("/" + channel), buildDotnetSdk, - withVMR ? true, ... }@attrs: let - binary = buildDotnetSdk (dir + "/releases.nix"); + binary = + let + path = dir + "/releases.nix"; + in + if lib.pathExists path then buildDotnetSdk path else { }; + + withVMR = lib.pathExists (dir + "/release.json"); sourcePackages = lib.optionalAttrs withVMR (callPackage ./source (attrs // { inherit binary; })); From 31ab3029dd9e3150b01d30d612b05bb32407cb99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 May 2026 19:48:35 +0000 Subject: [PATCH 18/59] pawn-appetit: 0.11.0 -> 0.12.0 --- pkgs/by-name/pa/pawn-appetit/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pa/pawn-appetit/package.nix b/pkgs/by-name/pa/pawn-appetit/package.nix index 6152bb4502fe..50dd83f55a9f 100644 --- a/pkgs/by-name/pa/pawn-appetit/package.nix +++ b/pkgs/by-name/pa/pawn-appetit/package.nix @@ -27,13 +27,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "pawn-appetit"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Pawn-Appetit"; repo = "pawn-appetit"; tag = "v${finalAttrs.version}"; - hash = "sha256-WJ/tFOizESDqdLy4maMKUZ79mgyyxqLuwCxWZ0+NVX4="; + hash = "sha256-9D8zeo62+xb5EsVQ39nPcwCx1w/47oY0NNFQyrSpFGQ="; }; pnpmDeps = fetchPnpmDeps { @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ; inherit pnpm; fetcherVersion = 3; - hash = "sha256-amXrz/ZzvjvNYlqxzTtQXiZw/NnUVJ7PhqG8oHsEe88="; + hash = "sha256-c4ckvmzosWrB5eXG/xpOH8mYgNNMgqBZ9q8yU7Pjve4="; }; postPatch = '' @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoRoot = "src-tauri"; - cargoHash = "sha256-UKaW+NiNA398nyGs9+SjY+tUvLjCPrSxX6bZLSl7/EQ="; + cargoHash = "sha256-bglNpRsHUZoHE7/KGAc9UHWI6Dtg7foA7/8NZ7qtfqw="; buildAndTestSubdir = finalAttrs.cargoRoot; From 3aadd2474373d079e1cc6c1d798c9254d63edab3 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 9 May 2026 22:49:37 +0200 Subject: [PATCH 19/59] neofetch: improve throw message See discussion in #495887 and #501520. Co-authored-by: Yiyu Zhou Co-authored-by: NullCube --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 403b2b4aa6ed..e10bfcb172a0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1471,7 +1471,7 @@ mapAliases { nekoray = lib.warnOnInstantiate "nekoray has been renamed to throne" throne; # Added 2025-11-10 neo4j-desktop = throw "neo4j-desktop has been removed as it was out-of-date"; # Added 2025-11-01 neocities-cli = throw "'neocities-cli' has been renamed to/replaced by 'neocities'"; # Converted to throw 2025-10-27 - neofetch = throw "'neofetch' has been removed because it is unmaintained upstream. Consider using 'fastfetch' instead."; # Added 2026-03-02 + neofetch = throw "'neofetch' has been removed because it was unmaintained upstream. Consider using the updated fork 'neowofetch' provided by the 'hyfetch' package or the alternative 'fastfetch' instead."; # Added 2026-03-02 netbox_4_1 = throw "netbox 4.1 series has been removed as it was EOL"; # Added 2025-10-14 netbsdCross = throw "'netbsdCross' has been renamed to/replaced by 'netbsd'"; # Converted to throw 2025-10-27 netsurf.browser = throw "'netsurf.browser' has been renamed to/replaced by 'netsurf-browser'"; # Converted to throw 2025-10-27 From bf30317baf551c4d6cb31bb92a3961ff368e7ae1 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 9 May 2026 22:52:10 +0200 Subject: [PATCH 20/59] neofetch: add release note for removal See discussion in #495887. --- doc/release-notes/rl-2605.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 5953d676210c..a585781131d8 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -288,6 +288,8 @@ - `spacefm` was removed because it appeared to be unmaintained upstream. +- `neofetch` has been removed because it was unmaintained upstream. Consider using the updated fork `neowofetch` provided by the `hyfetch` package or the alternative `fastfetch` instead. + - `vimPlugins.nvim-treesitter` has been updated to `main` branch, which is a full and incompatible rewrite. If you can't or don't want to update, you should use `vimPlugins.nvim-treesitter-legacy`. - `services.taskchampion-sync-server` module have been added an option `services.taskchampion-sync-server.dynamicUser` to use systemd's DynamicUser feature. This is enabled by default when stateVersion is at least 26.05, and disabled otherwise. If you need this feature, you need to set `services.taskchampion-sync-server.dynamicUser` to `true` and migrate `/var/lib/taskchampion-sync-server` to `/var/lib/private/taskchampion-sync-server`. From a8b04525998391b38fdd0ad621c3967e52dc0cc9 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 8 May 2026 15:05:13 -0300 Subject: [PATCH 21/59] dotnet: reduce update time The update bot is currently failing to update dotnet due to fetch-deps 30m. - add a --vmr-bootstrap flag to binary/update.sh This allows us to skip a bunch of packages and platforms that aren't needed for bootstrapping the VMR. We also add the IL[D]Asm packages that were previously in deps.json for versions 9+. - disable fetch-deps in versions 9+. --- .../compilers/dotnet/10.0/bootstrap-sdk.nix | 431 ++----------- .../compilers/dotnet/10.0/deps.json | 51 +- .../compilers/dotnet/11.0/bootstrap-sdk.nix | 431 ++----------- .../compilers/dotnet/8.0/bootstrap-sdk.nix | 571 ------------------ .../compilers/dotnet/8.0/deps.json | 54 -- .../compilers/dotnet/9.0/bootstrap-sdk.nix | 371 ++---------- .../compilers/dotnet/9.0/deps.json | 51 +- .../compilers/dotnet/binary/update.sh | 174 +++--- .../compilers/dotnet/source/stage0.nix | 9 +- .../compilers/dotnet/source/update.sh | 25 +- 10 files changed, 247 insertions(+), 1921 deletions(-) diff --git a/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix index 7b013ed2a62c..abe039f3df55 100644 --- a/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix @@ -9,31 +9,6 @@ let commonPackages = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Ref"; - version = "10.0.5"; - hash = "sha512-Ktpg7S9q0hqEU61eFrv9MD9Tjlh1dzp2SgoDjr7JaiBOaNQOLtyYVAceV9ezAcJ4psLKsTKO81oX+Iuf4RhIEQ=="; - }) - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Internal.Assets"; - version = "10.0.5"; - hash = "sha512-EVPO8CrM8wNIL1LpwgDzAzgAd/9GbyA6PiphaH678yedlzzMLZ5u5CINri9JAbJ3iW7QiTzOclPXhu0TWnQGlA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-LAqUC8iR3isE1E/FjWZ3ro1MyMXl3EnjkxlyNDr92fOxlcnnA4G5tdy67Vet3EuXIAtVNR2KPfCmykB7bEJgHA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Ref"; - version = "10.0.5"; - hash = "sha512-vO3fy0Y/qnWjyZbWNWh+ccnwHhlwhm7Hz/HgN/YnkU03zWgqXHLzu2FSzvmkgk6RAsbzw8Nm+Co1FRA4dz+Fkg=="; - }) - (fetchNupkg { - pname = "Microsoft.DotNet.ILCompiler"; - version = "10.0.5"; - hash = "sha512-Y6R0+8pMvCi7vq0R9RFtU6vj+gE6hFfAzXNMWKULFFHUlqbbVWhj3QBoQCOe5/4bQChk0QWg8k7i/pAxyj1WiA=="; - }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "10.0.5"; @@ -42,19 +17,22 @@ let ]; hostPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "10.0.5"; - hash = "sha512-D7Hz+xRec/A2VH9rwqrPxIM/YlHwbfDZV0Eikloh4eJl5LytP2EBCQjg+PWFmQnDoh4NxRFE5HKbtTaU9pqVkA=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "10.0.5"; hash = "sha512-pUikpkbJmTObQh5v7CrIGshp2kW+qYrxUVDML5pirTLPga3LI8PFp/IGaApvM2vO9nCj4QXwLCEm3WDi/aXNYg=="; }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; + version = "10.0.5"; + hash = "sha512-lwuqcJBXzERKfQsvyazrysr8w/sTXMX4yEWHQpxVbYbbJ0Q3NYZuBFF5b8Kj95CotZ7tROihtaj6NSU5H0Fl/g=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; + version = "10.0.5"; + hash = "sha512-xrlbKJinxm8YW7jJztS4jsWA67o82rK+sw0/3kB6LGBO0OfTWAAyn2wiM9nNGc7mwatWlaJsz1VpRnsFXPzhXQ=="; + }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "10.0.5"; @@ -67,49 +45,38 @@ let version = "10.0.5"; hash = "sha512-NM7MFm5+nQ/sic0P2iGXgxwDj/bGZ2r3cjK+Ax2vvvQNHIJl5knw8y5r9lFSYpIwE4gA1FN66W5Yb8rQopHoyA=="; }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; + version = "10.0.5"; + hash = "sha512-mLRe66IRBIpPbQupO82l/PWn5ZPPdQf3DcN+cSgpP58cgCyEpFj3Q7jCRRS3f7tLe9jc8B50yrybb3ztBJ8kpA=="; + }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; + version = "10.0.5"; + hash = "sha512-4uwzf2oSww5VcpDeI66ie4uRAB/CVJtuvWjbSunQp7tSxJcPIl7OnCY+TljJak8yFpJcFW4BiMlUGMIKBpKKjg=="; + }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "10.0.5"; hash = "sha512-Gi+ZdJq9xBsllyMv9TJAVtlMXeMpAWf3ArxJ49RJ2bpSW1lKc1nWEVQ3xI53MgGQTSi2D8fk/+mFP++jvBxD9w=="; }) ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "10.0.5"; - hash = "sha512-cobJfKOo+3sLAO6DRwHUuwDVfbDYiXXtoR/lKyGbSfmWSLY1qfGzJTVBuNp/+Rtncn/OBJ6jQ1fAP9Sul1OH9Q=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "10.0.5"; - hash = "sha512-qplAXaAnkLbVwaSI3zQB9YTfxrwv6xK4Ti3NPR0Hpywjqe1UhjHrefz4bJRVgh9QcNqLxdgH4ja6pMlvF2G10g=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.5"; - hash = "sha512-+4RIyAnPeoRDC1pxfS1fqlq5I8KRQgUc2hgLrNqbPmyO4M6QB3+e9u39fOZi/Hg/FHYx5TTVbB0GrhiCbMr+GQ=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "10.0.5"; - hash = "sha512-kNH0Wr161xmHhtwvu6hLn7ReMHHF/rr6orocFeAj7tXP1Mt3Hjpydl4ieTNXd+Q6QD2ufs14kQOcmXrWA6XCTg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.5"; - hash = "sha512-X8JiYyQFwRvpM63TI+szjk/2EVjkdn3QaxlDld7WrTB2EL/e6YPU5Vmot3Pjg4U/ORBi1bnygoAJIZWDBd1W/g=="; - }) - ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "10.0.5"; hash = "sha512-GPptAxSiLpFiXblT0g+ourLNofK6j30a3KjIt74OiFklg9Tr5M2MKhV8KfzJ7kqeG8jgviYuHy+2yZ1+8QchGA=="; }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; + version = "10.0.5"; + hash = "sha512-nhqDpYsJ0ZtIzmCz14yZxLGb3NWqi6+UUOvX8oWK4TppwB6k+BUSbxJqizxnZiPOdvEtDGgUg82Mjy85oDKZww=="; + }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; + version = "10.0.5"; + hash = "sha512-gvHj4jcm27QN4VdA88D5LesFQduNQhmOteIsxpmmT6RZSnvgGV5nm7QEAsAD8hcfLMJanC4LPT8wkSsXahSYrQ=="; + }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "10.0.5"; @@ -122,99 +89,36 @@ let version = "10.0.5"; hash = "sha512-zTRKBdj7hhJJJyXrlkcMiE+5rF/0JkiADnxVP2MRLyUvj4d0COAIsczwQgO3RxyYtsAgOiwwLscOWmb8A5pvvw=="; }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; + version = "10.0.5"; + hash = "sha512-CZRQIfY04HIsdEFKvgAvjv4yV9X/odFOhgAl7cEBFAdZAfvdnnpZpXEPGxBmQsA9lNvwDr610O0vVeDO4AKfUQ=="; + }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; + version = "10.0.5"; + hash = "sha512-wistTWcuIbhOz4BI3tYLnkY5w6IjJkk1QCbHzQHHX0o15qvsmMT1eb25CM81ZJRAwMSxPjhZLshPdTdhHPHARA=="; + }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "10.0.5"; hash = "sha512-ZajiQZT7q2tQtOM18Lk8SWVoCcYLKg0YXDybHpIast0mqM4DXXvNXDeTOERufdioEoxy5s6STiOy7BPN7XnX6A=="; }) ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "10.0.5"; - hash = "sha512-mkjk4oeHj7mutqsszAWhxtFRwwjXFr1uI5JopdN31Y1v/rxFwfwzjftsnlEwNcMtxWftooVZK9+uBQ66iWE7Kw=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.5"; - hash = "sha512-1bwi83hLpxKRElgr80UES+FV8uhIVX0T14hOSukAy6cgjxPVmkPvllcL2wcVL862IZ8mNvMubFMyIHI9X5tzKg=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "10.0.5"; - hash = "sha512-AEDznHbzYo0x/j4NJmGN2+9iaVC4G+f/O7MZWJfgS1ghSlQ1nE78/9n/CaKRaLV0kJszOrHSVtVT+WpXygQBJw=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.5"; - hash = "sha512-LVHy/0yiKtncb1QOk3ixTfpT7HyLqX0ahpybFSbr/E7D8jJOijQ3eFNHpyzO9IQ6yKpA1/f1maFy7xg9hMPxJQ=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "10.0.5"; - hash = "sha512-rsn1PvaakbpQfUOtyLodRcJuUyyn1I6ubGmt2Lfn6yVdLi761gEUqy+uPbyqw7UUBOVZHn4RPhspAXjIufixlQ=="; - }) - ]; }; targetPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "10.0.5"; - hash = "sha512-+ilMva1bCAUMrOpPRiNfzSewq/Tp1JkrdioTJDxqpzsfBuOizDynqr0tBbckZnWiygo/tKjZWP8uoZNAscroZQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "10.0.5"; - hash = "sha512-ov3HneAvNdMPK9ALqRKEu13VADbbZ6D+jdRHqkx2pGAu6RvueNGLLbiufNTlTSLkXsZMI6XlU26aqycPG2zXdw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "10.0.5"; - hash = "sha512-JkHJiR7vL6mUtdIZz2YXIQtWqabjdgHaFxyt5jQWOJHCvc3RFAsOVSMMsAC8l+npjkjipTy1JDidbiygJtFGYw=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-qRze/kRX3MyRvmudB+SkxSdisBYtYCI/0s6uCq15j8MC5ls1slhDOQohBhpGqokJvO9p1/BkRyogAejmpveAmw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm"; - version = "10.0.5"; - hash = "sha512-GqlBlcnxxNX14NUTl13Hc/AewEadOuaWRpmQURs3zfvWjqMXkE1yDOxA/1j0KnFfJEjFXqYiAn8Q52gIYq1Wag=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "10.0.5"; hash = "sha512-Kp+MsuKVXftYrRfCCSG1iX0Bx9PXtE6dkKof5WwgW4OKwEmQrZR1u/shk0pXlTt/j18sALS2HaZd0sHuHjVfXQ=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "10.0.5"; - hash = "sha512-qt1Ap/tRTi6CavFtXJmBnzHpIBv+MXi8x2SZuNdolC5f9PJ91Knd3cRMl0doebNFo3USyWeSEMuox8opiVtdSQ=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "10.0.5"; hash = "sha512-7/upjkbj/5xKViNzlVkYPq0hIwCnjApGmxRCLWdW3HBXdwVUrVsvNtvXJW1L58HlIK9/AaErmZMrjjhfbZMUlA=="; }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-ucjmiECPTHBzvBe6H2fmsY6Ensjj7Ke5NUlOxFebQWhkdwS60zPOcMnSrns7qSJffL6jp9X0FOHWYUeImBc9dQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64"; - version = "10.0.5"; - hash = "sha512-Z5+MK4jKA1mNwXAvtI0UTg67vop5LoHRtNgKtQLZkjk+ge+F36ybFQOOhcwBu2Yso5b0rn9V9H5DI0n8osNp3Q=="; - }) ]; linux-x64 = [ (fetchNupkg { @@ -222,107 +126,11 @@ let version = "10.0.5"; hash = "sha512-S/cZ4FGOWCCdkeV7itqKS5j7kui8GDnJW16yAWCT6QRRkbXF0yP7NE18hdnEydZaQT8NjECxRjp3mkwl/xkawQ=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "10.0.5"; - hash = "sha512-zL01730sNpJABOrMaIYjZvX1dYGB7FnIHHbFBuxUoRxxCKCxO/g+Xc3OHq5omR0R1Tj9VFrYZckPxSAh7tM3JA=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "10.0.5"; hash = "sha512-geyVni1xsr4NPqWB1ygit+ewOhJv3cHoh2PKT1dP+6AlBkeALZZnAhyrSuG0CHgIE8+mpFSv/CxQoWPWqFDZ/Q=="; }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-7GDrN+V3+go78AbI8EGZRbI4d1/446XUDrPs1fo8bXOUKmW3MhpVty5Yur/rShI+g0AaGtsOsETawLRKfrUxmA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64"; - version = "10.0.5"; - hash = "sha512-767sIOnHoYvcik6wLCvJg/aemlmHSqDQRaCghd36Go9QYJMuXcYtdGEk6m4mRVM3pEirS5/kVqZWtWhDdL5RpA=="; - }) - ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "10.0.5"; - hash = "sha512-DkRALJnKSi/+0zTBkQfLVZP8FR7Hb33CwS+upyYxq/Dpdi2oBjnr0pbJLdINR83j530P47VgUKwKr+l74ED51A=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "10.0.5"; - hash = "sha512-SonDz+TLIIBe6rVjdzfKR7SyqvOn84ZAwrSLDWX2miRSwMN3iIYAHL1nkKii5aJhqUM0xbl69zRxEp0cbqkPbw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "10.0.5"; - hash = "sha512-g0ETxPNUff6SxCXrjUlzj9zy2nPpmgzbkEwayQngZTGR/zpgL5jLI1Q6e/GGGMCrpFc+SWIO1hxpqui1H4TARA=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-I4riXKiTE1O7a/H4aCTmIFRE4LlmMLwzyAo8HwbZUdqYNtFhqm7ByTJ3nHi8BTG5CPaE6BNJ27/MPNqN+sJ30w=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm"; - version = "10.0.5"; - hash = "sha512-yXSmkwzv6MdUniaBk7+lj/oV0Q5CoGiX6HF4ZxlUxaCTcLkg7XI+kRfBjD9ZYZHv8qChc/nkU9zJaZkpbQuOdw=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "10.0.5"; - hash = "sha512-IZTJ4sSam7VntRBhvpCjJoCDnb6F/uLy2wpdOTyrenwYxfdBYQPIPLJeAemH9wYuIAv1/ljd9N9HR3K/l8hT5Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "10.0.5"; - hash = "sha512-8JZThCg9zOAu9PEJ/ETfAmGqL2sY88KNBp3MTZrjfQhYHGN+uTnqfUA7TpJtiTYFSrmY3kYJ5KBzv0jj/cNBHg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "10.0.5"; - hash = "sha512-YLR/sCAc99a+zAWZEvP5NzdOg48vifHRdEx8PKIx9AG7upx7NUnp7Wi2HAfC9jzAMziP4Nsmk3qdAPKh3l2gyg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-f0/gO5PzVXMrqeRATua6zobitnZ+iUE+JxYSw3P0BDgDFPt3+uWI/eULbLjTosr3nJdLF1Td9sNGYxpi54ivpA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64"; - version = "10.0.5"; - hash = "sha512-3gLTjeteK89N5/onUYJm1KPt+xoTf37ZTJwJ+G9dv709v1zLDpZEUtG+puLOIZzCFpzqnBj+2+JDdYrX0skmkw=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "10.0.5"; - hash = "sha512-ao2tW5jlik4441BgZSpspSbcJneWxQhu/3eGL91EjY7JsQsOT5ga59ULSBWo9X6VuqeHQN8dVMkvNbRzMha7cw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "10.0.5"; - hash = "sha512-+McjW48YCQx/uNHsyMjowcG0cFg/fv+P9wAQ3ra3cwjbkkSbuAQcfEDiF98mwfPOdcF5xFVSiUJKErnOX4YScw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "10.0.5"; - hash = "sha512-dvIY+3OjpqPeYN7nUzmCE0AcOAuzAFzH6/XnRq6MeqEHjFaTAU0uapdxn+qDOvAvspF37mdIUVuNFrlTGkCC6A=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-RoiIBfpNaQReuCqRqzJ0pe06udmDpf5mgKRDdXilw19ZXhz1rs6apVKbaMQAPUDwdxQoiuxhFIA1EQSZCfImsA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64"; - version = "10.0.5"; - hash = "sha512-z/tKLcDLBPdTiyq9LiHb2OcvxhizFcN2lOdkmMdOP1Eh1BQ06ws+8yzdtQGSzDzmvo1uGES+7Dor4qDtMcUYiw=="; - }) ]; osx-arm64 = [ (fetchNupkg { @@ -330,26 +138,11 @@ let version = "10.0.5"; hash = "sha512-E49zQ382W6Tdx+kTqxwS/6AaWXhOn1ToqArv6Q52HQLEPzouYvXKZWgw5cPIUnqk2lDO1xLnWJ3WgLt5t3XxVQ=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "10.0.5"; - hash = "sha512-tF2X+/u+NZTLFMNA3yhZhbUr/w5dc6J/6ARfV/MDcaiNWawD1XmK/lpNlOPaLJYdSPpzL0cELZ+MdD/bGiL72A=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "10.0.5"; hash = "sha512-gSNu28XZcmjXfcbd1k1/05Yt1705LtruRRvU8ISXYaSHDhBkE2b1ylBZEV26OfnJFdxfF30lGXFoVzk1UqvYpg=="; }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-6mVo20DumP+FsdR53lOJvDBFYc5707rwqU925HHEsxYhsNk8v/BfRRGynmCINpoCElBZ7YinP+nhCGdWSf31Sg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64"; - version = "10.0.5"; - hash = "sha512-kN11Hky8RX71JccTcYPDXa9FHW0P2MPpZYyeWb0xZcYQX8l+9g6VdOZ1s40g1izuYUWR1LYCcaZkClix8QvPcg=="; - }) ]; osx-x64 = [ (fetchNupkg { @@ -357,107 +150,11 @@ let version = "10.0.5"; hash = "sha512-vL/Xgnw66cgdg2cwwttTEJ5BaHokLhjjW/q/eWQfkGwNF8DchzR4PFoMKd+o3Zk+6I5AZneWn1mGYLpo39JS+Q=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "10.0.5"; - hash = "sha512-aKH4tQCrzWnVntcprnrsQVLpLMrn2gJXSLqRT2AH9+9kCq7qdelzev1JY+O3Fb+/dp+/v9mVOXde9GHu8G2uaw=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "10.0.5"; hash = "sha512-Pty0O+hUt8GO3kB3XY3lGic5EKgbMgzY/n8XvkBsaVspJ9VeTvlvbhffZ81vMDfARdeQ4uYXzd5a14NSEfdNhQ=="; }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-U/Xph2FJHj79dHtyOWI4+pp2ZGgD4v9Ky+hOQyRmgN42x+uYUe3ylyW5hVQoVH83SjtrZvW0OHJ7TU9dcAZRfA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64"; - version = "10.0.5"; - hash = "sha512-+j/ZvkuvYbsipm16qIMyyEoYU9bN1ocGk0Bb9VMFA2nm+u7i6uNCZHgbKirpDeXiw+jLwTagv0542P0++ZqQUw=="; - }) - ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "10.0.5"; - hash = "sha512-XBGMqFcb278bleC2+uieyUHFYAYdCwDlqPKa2JpiLrSdbFwbTD0jd/bACFCfeJj23gPWS0hUrFP9U6sexov1hA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "10.0.5"; - hash = "sha512-R6wUWrRt8Q01feMFx+rooVC3QgJzoPrqnHkpFOVyFP8vbtJJc0QFADpyGolcTQHdaS1qocx+tOE2O85rxSzfBg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "10.0.5"; - hash = "sha512-V9BNBzKC9tb37jjsdkPE3XrLa+9hVIzSy1QQqD79/ZXNbC481DKzJzbSEWqZtlH/jn+oxLTVioo1cyNcMtE5lg=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-CMdJ1KpI63ld8rfiiYqB7JPEi1RZ6qRqv0xip5OsieJ1IQGKbje5mdxrVqqLiIveUGsdf99Y0rJMEv7vQwFLDA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64"; - version = "10.0.5"; - hash = "sha512-SF1sLHKC/+acZAZzLf6KEHnc35UToczWBIUTJTkG6YgAIxrtkDZ87UuhuJ88nG3SXzUu10oM3iJ2n5BcBAB+8w=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "10.0.5"; - hash = "sha512-IHCUjslASrwPeYCuVEqNtLfuhIEgvPH0XhfigHyHsmUeV7o6UBKE4XmINjufE2tsgXUnlRG4yHZVgahqFVYQ0Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "10.0.5"; - hash = "sha512-ts+lw10c/3rqMgwwIEq7KKJ1elP4GL4I6h/vZ6L/gdBZTneCqUU/1yiDpKmGWWPc3sRgM/jh+juYibH3ZxrwOg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "10.0.5"; - hash = "sha512-GZ8vwTCPtxnQifh60odRfe0aq9+6RkTYkqXa0JxVI4t2HxPDO3JDkwLlUKZdiFgfDRQ4rkux01Pui3rO1kmpLA=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-yAa6A28bU0SgTVjKvEHI254vgaRbQOX5zwyqelczF4Up95wnUdbo+dlgVKcDqaQtnGdV3A+FI2lCANj5IPyP8A=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64"; - version = "10.0.5"; - hash = "sha512-KNQZFfnPusZJz9KKGQ0MYujNI3OvPr4Ce9l73T3jCXbh7y80y/JFimg+0Whrz/mHBLWOpLt7/1cVJw5psV8rNg=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "10.0.5"; - hash = "sha512-vYxGmc8gORpENpwj3x5KX799nmztgPAeoCUJIjgffzh//2cSeNxnKSBlDF/UHEMWIxzS+KvIySa3xe/0UWT6tQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "10.0.5"; - hash = "sha512-56DjoIPiUrCz+KNihIcywDJooPmHzFYpEPgWaZVb6p30OOs1KFNnoQhD9Yy4BqeMR0YrIuf1otKKpb5oeJ20nQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "10.0.5"; - hash = "sha512-keZXRiTa8DMzEyk5r72fy+KcARATMLx9SjdG8tPt1spm5q53E51r70JgTYUWmy/EArb6agEAWcriBdGH4nhcyA=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-mq3Dk48HNnAlEfVTFpne0lP94hgJrQCYTSxOwWolaS+yc6oMXzCmJ00tBaMn4gH+I5AwBrRhCJu90tRGFw8L8Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86"; - version = "10.0.5"; - hash = "sha512-uYEXkEpI1YGxnwPAvefr8htm+bsGOZhA+1Lqgr6jecFcsV79tPHNa/RGZtWBi3Jca272oojjqnXIc3ai4QQKRg=="; - }) ]; }; @@ -468,10 +165,6 @@ rec { aspnetcore_10_0 = buildAspNetCore { version = "10.0.5"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-arm.tar.gz"; - hash = "sha512-GuziriIhK5fpgTan7noU2WkAGceJ8U4LgReFY5B9FSHwlxvITa4we4KWJv9n16tm3+sSAP+EiJnXykBQ/IRUHA=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-arm64.tar.gz"; hash = "sha512-bKs7gZELo+bhGFlaRZSDMfXRUGtCrwlC956j22Yj6CBVehdXlzvsua/T1vjq2emmQWZ4YPKn+71Zi8r6OPRznA=="; @@ -480,18 +173,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-x64.tar.gz"; hash = "sha512-cQjs3ajiYH+oDitF8SCdevUwHVNDi2XSJpYFuEFa69SdsjRV2NzXfY/czJBMkgK0g0+couAOJ6UB0gBhdNdsxA=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-musl-arm.tar.gz"; - hash = "sha512-8QYwDJeXiTDL8weEVdh1kU1JtRgRkPCUZWqmbpJBUhUFiJH8JVH+fW7gMaptsLnWhOLw4lHaFf4sg2EUb+98oQ=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-musl-arm64.tar.gz"; - hash = "sha512-mHRGpwP/9xNtrY42UX6BAnkuPlerK5G2mkPoPIRV/D6wZy+3ElLuBZ6OlPlstV4ZcGuJgOPfKgbKzVtwUwV35g=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-musl-x64.tar.gz"; - hash = "sha512-enudhD7jCKrSkqfaGJAfP8oCaV0XoVscuKeFfOEQLrcT+g8VBdTih9sORz0zFkzMas+SdcIx0GsjpUtpvv3T1w=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-osx-arm64.tar.gz"; hash = "sha512-uGWDyRjReUEAiAhE2hAoQwnQtlcGC5cGixJY319lsQWq42zF+H08z+JAhzro8EUMb/x3MI2OXP0eTLkYelKxDw=="; @@ -506,10 +187,6 @@ rec { runtime_10_0 = buildNetRuntime { version = "10.0.5"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-arm.tar.gz"; - hash = "sha512-Jj8OoRHgcpPzA9RnPuNMGR5Ed0CmBLZ8WzXbx1smC7R7w3SX5IuELL39wpppAMKXZbpna0EHZKwrokGciT+OJg=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-arm64.tar.gz"; hash = "sha512-4jd8PCWQaNhgO6WgF5DexHbd42ELLSXlco733GbqR1BXRuhtMk+lK/yfFW7R4XAziJ95RLdSr66YOova7F6Qeg=="; @@ -518,18 +195,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-x64.tar.gz"; hash = "sha512-knwiavQKvaWYax05TtlL8ACKJ5aN5A7HAr4vo+2HGsarbSa5aLjMrT9IkSaMz4QLvUQBxqeli6rDyHtf6NyVkQ=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-musl-arm.tar.gz"; - hash = "sha512-zHRDvb4j4PD++ndXNkOpzI9rjnGLexaz2KIph/jhF8FmeMCkkVqj+18Iz5DJE6mYLKQ3CqDLYHRAidizC5Fipg=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-musl-arm64.tar.gz"; - hash = "sha512-77by38lmtLmAFobWKvlEJcZ9jzdVfMlCgSIbESrLtgZ9eEENioHrU3qkhPGYta/yjl0KYrfoJqDlU0N6KJC0mg=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-musl-x64.tar.gz"; - hash = "sha512-v4rFy1JPAwwtOCxhi45R0SWlySjFa1A1H8Lau8ijfTVSvXvCZeLay1W/FSiHaVH1K5CSFlKEu9IX+jyJqqHjfQ=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-osx-arm64.tar.gz"; hash = "sha512-saRJmrOWdccRiWFctymL5sgJaLbxEehabDflHdc/SYX2gkJcjKX5Zyz5vU0gjZZUxQKb2QH9C/wHKceNRTAQUQ=="; @@ -544,10 +209,6 @@ rec { sdk_10_0_1xx = buildNetSdk { version = "10.0.105"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-arm.tar.gz"; - hash = "sha512-BYl4cX5Opk3MeYSeLngTjUOoowyeq+mxKLxSUf+maPHAFD5tBmOK9zQ/ukm7k8weLgVauJsMJfz20MowNo0oXA=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-arm64.tar.gz"; hash = "sha512-MF3H5/uZ/NiDDTkSKBf/W04EiMz2Mcuc3H16jsHgQFwc93IaWgERVKWpbPzDl1xgzToEjV0OgADbVAWXlP+olw=="; @@ -556,18 +217,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-x64.tar.gz"; hash = "sha512-Kw7RMQbkyFnMueOl8aRQ6EYF69ib2ErDRTswgQ7PpitpV7qqLtBBzC6TL1EhE+FuOuIA/lxLSL5mdndHoG9OQQ=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-musl-arm.tar.gz"; - hash = "sha512-6D2zGInXEQdr4eOol/CAA9T3bE5RyGl1rAFA21jN/34mplF078z+pyc2hXE20CvDOqF1wP4K8pZ7SEUXScetUQ=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-musl-arm64.tar.gz"; - hash = "sha512-EzORZO6Xm5QM66MKrIAzbxVAdNYIIyJBQNAUXYbLvsF/MMtIFQ3fPSVClKJ0ohOivTlLwZdPo1dmHSCaXISdSQ=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-musl-x64.tar.gz"; - hash = "sha512-JUuwDV5oqtO2+4WEcwG8AIq2iex49gE5fBx2JApm6GZI66oq/32za+NVwl78C7LIHCK1hm903zcQDDlYm8XIng=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-osx-arm64.tar.gz"; hash = "sha512-kFi8F6r3bQLmamLhJuraDDQwdeQAcx63QVUvF7nMOjPxhUEV2W6TfU45GOnIBdtb8q0wm8RciSIoxOdTSDktYQ=="; diff --git a/pkgs/development/compilers/dotnet/10.0/deps.json b/pkgs/development/compilers/dotnet/10.0/deps.json index 7f588646f196..fe51488c7066 100644 --- a/pkgs/development/compilers/dotnet/10.0/deps.json +++ b/pkgs/development/compilers/dotnet/10.0/deps.json @@ -1,50 +1 @@ -[ - { - "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", - "sha256": "17bcd9cdaee1c8949b22fefe5df4f92daf3faf8846179dfb9cebf26bdb4fcbdd", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.5/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "ae2022aecf016718a1807c83c3c66e03ffe48745ad296ab4ce70e1c37c2860f0", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.5/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "hash": "sha256-mo+oXTx0d1MYBu+EoU82S3Sw6hLpGq8MNDVYpSUlwDc=", - "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.5/runtime.linux-x64.microsoft.netcore.ilasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "hash": "sha256-v/XY6xI4DJV9s8A0iXLPMmFCi4YV1OKPvxNgGZZemG8=", - "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.5/runtime.linux-x64.microsoft.netcore.ildasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", - "sha256": "dbe5d8ed855732380b551131f96c00756e374a59c08883a914eb0bd101710c94", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.5/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "646dfc625d1f6e92a90e31cb31f50e8b8a39c25cd41991fa61f2cf4884ae28a6", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.5/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", - "sha256": "7f2aa235a98b43a1234e0c405f4d94fb06cbaf0db1c7514f567f9ee884ef48ff", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.5/runtime.osx-x64.microsoft.netcore.ilasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", - "sha256": "49a785da3abe8786f6ceadaf629e27272aa649e07ffdfbb8b46182ac5e48a0cd", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.5/runtime.osx-x64.microsoft.netcore.ildasm.10.0.5.nupkg", - "version": "10.0.5" - } -] +[] diff --git a/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix index 46cdb5d4b0d2..1d9b95bc7c0f 100644 --- a/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix @@ -9,31 +9,6 @@ let commonPackages = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Ref"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-v9ejIc1iBCwhl8FAuZY/qCVWJBrgWOr6MfLSsYodTFTx2V/X6LKU1Fe24LegPnbpoXqIJmLsBIQrO4KoIxuvSw=="; - }) - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Internal.Assets"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-ecGx9UpGsZkAlNFoZjtDXwuAuh6wCPNz55MLUhmLINpAKyrtIxX5mq6BQETx/P97IeJaEWSWX45OF4+d/YMj2A=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-vm5WP67IC1Np4BKm9Ru+LbzSRhA1bkYy8zrZgvp/UwH3j6ZYrKNqjRt0wO36gNe6h4wWhonU5815ML3pWApN5Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Ref"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-unbntVG3e4LZW6HNkL85AapaCPrvCLdKn7AegdVkIHL+DRaN4uL+Rzu6UyloIx771dnUHqve0E/no8mJ3WHc5A=="; - }) - (fetchNupkg { - pname = "Microsoft.DotNet.ILCompiler"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-H1D3C+gp/xw1yY4K2dSR2r9KPaRYv5QJ2AThbZVcIhkLEYaXMnw288Qzxp+PnLWUyeUXloTiNpKxZKd5XqDohA=="; - }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "11.0.0-preview.3.26207.106"; @@ -42,19 +17,22 @@ let ]; hostPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-qYL5UAYuutTQcgU4mCHmpOrs2kBtNFvcW6TVuLtCbxyiF3bBBF8CEAIdXy60N6pUI3IbCMkXNvXd6g5AeIKwcg=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-vXKuBO0i9nUi9uZbtEl3henxyik4SsWJwjTV5Qwz3W0OcE60wc7vAGiS5mpp/ri8imRoOOwqHv7LOWMwVquCLA=="; }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-a64GvXhuEc4ivI6jI0tgAllXmkhxMUdTZgkfH5VmMpuQqltqYFj/c3HeJp9yeCX0fqO8dRVzeFshWHnEoJk3KA=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-vBJCIWQCfLS2IBJO7fy2OaADC7nG1GF6lUeJVpZQkjFJaT7NsvNBVV9o7h6lSoP5I0jK7Wi/CY0gJ3fF84wEsw=="; + }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "11.0.0-preview.3.26207.106"; @@ -67,49 +45,38 @@ let version = "11.0.0-preview.3.26207.106"; hash = "sha512-6Qh5ssxzcqrDlgI8EDs50xdkMSk8QRNCvGzF4pf2PJKrDRwf/JWJZuVhzD9VnUQYj4FT7k2K5E++zTWfmeqjXg=="; }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-v7xwwXjh9DeLO61O4Zg3kbuz3WOhlWssK0bgJ+nqe87IYNw4ky4aQy7OtO9WlASyMA1FB5kr3FUg5nNrkZVpjQ=="; + }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-S8gEsYiwDhFSFVI+pWt8x7fNYYAuYbnb1jevZRUYYh2oKyJtmDqMJmC6wOoppzEFO7qnkYOOrhpEabbeKJsmZQ=="; + }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-tqmapfWDTNsoVsZD/qFjt9YTnurI2Yk+MRN1O9Imzm50H2xLbcZ+REeozRaetoTJkNjjOqnlnQsBgeFuRLQzpQ=="; }) ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-ufweW8RLeV5oBvsOVIYhhq1fgpf3UHoOj+FYLN/q5MCw1yS7RKQpilpk09Gwqi1yZOPX/0p2DV/RKnIlrtS/Wg=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-K2IH948OGXOKv3gyUAUQWEES1iyu6Mkbxywl26nU+2QH44A+XAKECcRhXnENQz0K7PX1xmSNaMPfJqZPrqRvPw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-kzqFLg9HiUZYTztg9s8wrOuaL28zcwR4n544ym3RgQZBN8co5irQmxfGYYycNLe90tnZMd33dzTHzCS4w+7Jyg=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-92+59M17m2iYairYoxMSlGntU9SsyUIO3OFP6rlMwa7m/CKL0rQ5iolCz4m4WbBAuVtKARhe9bWUZl3FyzJI8w=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-JwTIT49618ShygrCZlFxawfdroMPv5tGrtnml/MFw6570F71Xp9hTtWj4HcGgnSAs0q5FWtaZvvoGxfh0PAniA=="; - }) - ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-6Wx7R8lAJH9+STlTmhvkeyOPTHwtL88boOFzXBWykV0v0yypzdFvdOfjAvf86zSW5mSQMY147yATjckSE3q2gg=="; }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-mL6CWnO7yosgKNrzCOinLs7ty0UUipr1uRqRjk6qjm8X4tpGAedjjUtarEmXWT6Z9WA1DUNt8GpXnqIthJchRA=="; + }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-FfDI3F7L8vT15tzaubmNYc94APhUfDQFfOaKsBuvcgBiyVaM9qdN7shTH1zbW85pTE3m1G0zvVpGC80Z7y7PYg=="; + }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "11.0.0-preview.3.26207.106"; @@ -122,99 +89,36 @@ let version = "11.0.0-preview.3.26207.106"; hash = "sha512-k39ojqAMM5zpLrrM70KhDN5dVMkPuaaNDEQqxD/5BIzx8sXH5q3m9wyxhPAjEqE6gNESSuMNUroxLz7U5e+4AQ=="; }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-OTDRYrIgu1WN6Yy+Jb43gSdNMhUF4dXSkOi8pqUfJFn8MH6lHtJfGYSa0KrE61jWwKKUWdXLAx42Gpne2oonOQ=="; + }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-flnO+/DUeZE9SUmkyIlMsZrvVomX8eshmKUxzYgO+E31TazXiXwvA1J7unq86gQVXlrmoV7xutlFVET56UmMBg=="; + }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-RVOrXi8vm+AB/6Ma3kO3cOTpMxg/B6td8edIeiu96XyrOB43HhoNc4KLJYt3//2Zj92sBip3QZhOB66+XvWMbw=="; }) ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-C7DG8JmkW9Sg4eCCRHRNbvKtjLC/gqG87Rc5/98l/ND1lQUt/zpe3i4W7KkRaF27B9J4Gq/Kp8v42lopE0Kc1A=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-8NpmV5Mi9uazvpb5dgKMDaP4h51oaXQm2/zJ9AQkOLCaHTuIC0QU5aNRv4Zv12yhJ+1tQVXtcr7PEGoa6ftdiw=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-/Jg3oEfmXEY4rRR8EGz5Xu/mU5SZnGzqJe0wPoDCgJbtf3STHRTtBZkB8+DdYss25dkq+yMzCqJDg79beJ3atw=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-+WSonFTv7KjUG/lpJ8yojhJa0vh7Gi9mpg10WXZeQ/olGKe+IJBf45DpUWKQG3XiehUg5ZbQSKW1Mph13EuLVw=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-+Z4QLOIOxxWnel5s9bKr6xzITVVrLOnmCxq19haSZj8gF5VvtuSvoxysD9mj6JWfGLWrYCMWuw/TLtk1ufVmRQ=="; - }) - ]; }; targetPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-9xhdqwdodcbW86pgg1bue/1D+OMkoku+HIaOs+Y2HeEWWUkuvGaVknt1ZPURhNN6LoLGioshBwiLX0FZsBm7tg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-QzRRGW+09aDpSSFtPeDVkSvvZHO8wRV2uDvfwGBXFwAvS7T0srl/iF6yqlGGLm/O00YLexvUbvbo21/I/RvSbg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-tzRhQBoSzqbQvL82tpdy3AOr+szIxCFSVJd8/8MeauJ0x+Ta4KvqG2XAjB2vaT+YZSo8Wr4OZy5eV9dyZ15IIQ=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-S7t/ntT28m9KTteqe5974dSXa9UgZL5FzZnhLa6+HNvEwJi3I026JExPHNsPKMDanXKd4jspZ1EcMFp93sCZ+w=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-fTn7AT8ohQMd7yUvy/LZlGCrGr+wdZlWzn80UYAVnVmwX0CkXNIJ2FivqyTBFVuIJb6H3iIVYsk9pTebmxAb6Q=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-cqn+9UZlNhkzywCde0Qnn64+DvrneOw63CGt2l49gIlPpROoy3XZ4NxpsSAq2coyeFYzYCc4Yt5zym0Sw4MTfA=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-8dRbxg1l7NmevWCg21XjkBaA5iUmwInnKzOS2CUO/SKDRYpncrZt0vPcVDg61KiQJ+jzixrxuEoYm5UadQwIWA=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-FMwUBAikT2x1waTYFb5BmDqM6l+5u3DUkcLcGUeQRXUlp49llUjDPJ7lNgi2RbWoDKlNGk1uaMs4+TfDzCsdJA=="; }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-rztxFHm0e6ZyTVut5NOIDypktJuJmgxi9pXg3FZLCPdQpxyoRGzZAC09jAopN53n8bxfyGt6Fq7uYWlPiSx4GQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-GOfCqW7YBw2quGeJX9iMT2N/rgZqH5iE46DTlie3KCMLYhlu8ZbD4Vx1NAuIc6RG31cyvcwTbo8oXt4OUOqCfg=="; - }) ]; linux-x64 = [ (fetchNupkg { @@ -222,107 +126,11 @@ let version = "11.0.0-preview.3.26207.106"; hash = "sha512-uy0CwGFb9UBJyud3t9DTNTohncZKKxaL0adsA+/sQ1lRt88qv6fZlOfWj3zH+s9H8RlreDQNmnWVp0R7Ooqb1w=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-3P4sEcwTUuEigYuuqjNhEaUrmuPHlivRosmDqi8FcyXUq+IydBBKScEnaYcyA+84paS7088o4hany+tRNb/ThQ=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-1aPEbl8CyJK+JaSKp5aKGXTptfU+4MqLN1cKeXehibb+ujjrOnsaaDbS2z24l8ygCSSbgiWNtc0AtWoKzGl5Tw=="; }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-b1vqxy7kPh3D3nUatLiYFptmTFwokSJp+sqFB1FqNeh6WglDsriuescHjRdLaTY5cpHzPjo04BE4/X7aRARf4Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-fgKQBYlDxpda86MWKOQg93vdwLooITudikNPBMX/638+QTG7kisG7XoKV1PQ5XRTumuSfPiXwYrPJ8XJPqFfbw=="; - }) - ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-Meqyq0cWoi3shkYQ/2zMp7/E+OOxS5xh7RFFUOufOj7RcndaDH4R39fNehsEycG+o7VueXQjTDHX5cuQKo9cwA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-pnwWF6BmcbhLGZ3r9AciEZPHRRqeYA42LQgd6RiEdIAX850b0bPoR/K2L9Z9Cmr5eU++WvFm1h6xDSLyps13pw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-529Vmw1f44/cSFtaSgglHfpk9GsgfMx67M2Pd9V4lp07UohhGLnIbWi93tesF8f3f6DVa83HDHZVcoi+tcrqPw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-v/Vou2NCp4TaHuqcmyHwD6tbS9ZeEB8UNpOGiNashSl+oe30PXELQZAPo0jUyhEEFpQXlPv9mLKw3GFwOeZVVQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-UCaLlw6ZA2+CvbTvpT0M0FVHbOiuetvKknr0po864jG5PrlO2rHT3WzmlN4a98Qf9yl2Gdc5LtuwmDVwcfT9ug=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-HSXS98H8g4asFOGfCIQ9l1v0jMvyn/tVFfMXu+WSkZbImUeIFefdwrwx8yfGDFUwD0HdDyTFZ9Yn5+R/xc1Jfg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-9kjJVJV9nq3uPmGfLhduXZzd7s7mgG2j+p+/Iy6vUeRz9N1Q9S7tcukj/2M+IVEuR2Hkah+9dbZVhNmexKr9eg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-OgsUPS0XMjsEaQCE//fEBx6Z2nUl/jzXxD/fUmqM2tzxp7cuFadbMjYhKSiaHJBDgiWv44mJNZv1mZc1z+fjAw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-FTc3titT6ZCr0H0JcgoGWzWB+xRwdXWkOV+pwNo+K78zIXQFJWCQQfo6LAUfLvDZlqxozxkaM+hDrrQpISALhA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-lfR+ifWtlhM4/SIMEa8bLCyCYAg7vU+fARkRcO7/UgfLhMeSI3XQvwDEL3UxCmaFMQjHx+V8z93fA2wCD51rxg=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-mxKpkfZzMEG5FinMt16xeCtrP9fIgpuUrhabyZIezcllck70tCnJ+no5RMOiGegoa0RS8GlFfktgwbUNGda7gQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-L9Zqe07OOR5e5swhW80GVOVHVOazQzAFMUsQ0OvT1ROoV8GwWxopeLxaduvRIJ8mrrwojr1Qh9R+Wm/L9DNYBQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-8Lf+zLPZA7fdu9qZq58Avr+5Bpwhk4xpK0/IIH0LqXMmuq8yuNlKGdTmzC28kE0aQ28eBUyw+vR3kaUxf+zEmA=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-z2V+omJ4hstb53weBUAQSR927a2xDBTDtzba1vZvMLSOciWju19guP17SS9dFd9chaImfskG2+lb11l9guRs0g=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-ZRzzqGejfhzYjJtelFev47nTRlByX23VkSJEMEEbnjm/GIkfAIaoii7zjFzye3Th61z3RODsLNcSIhz3v4ma/g=="; - }) ]; osx-arm64 = [ (fetchNupkg { @@ -330,26 +138,11 @@ let version = "11.0.0-preview.3.26207.106"; hash = "sha512-hBWzZdGL4XCxxsJ+mL9il/UZeCe1F/p8ifC46u4GpW/r+13LWdxm9DA6Gd9A/gX5IfltOE1CxWZoG8EXP1J5ug=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-COCbrVk2ugW1L+vrn3GEkvbL7mR7yTjQokOfaIuhf07SliM4bt8c4WIL31akDAIKoUPoEiiXcJOLK4iFYdIaDw=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-3UNG8Dpxb3efcwjFkkA4Nll4tYuEsuSG0EV59yVBMWmWDQlqaYvtDHENNCsqpUWtCcRP7ovre5jVQMi0mC9+JQ=="; }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-HjhumZ+SKvzN9TBRyJ+wivZGSz3OEYpQ0D+z99Kir00FJD7Lu+fIzkzN71xipPG0PNeo0PdI/GwPowdHl5qsfA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-31FlRjnxww15d9LbWL9ajqZFHrNZheOGkyt0V0QyzyJeTm/MIKY5p9A1QPbS/mFHYAuP4eilAM5mj5seZGUYFQ=="; - }) ]; osx-x64 = [ (fetchNupkg { @@ -357,107 +150,11 @@ let version = "11.0.0-preview.3.26207.106"; hash = "sha512-yGn04OHjVBBHhbutZdPGYjWIKHV7ezRBKheeeXB0739reyAGH2H0RbGvTN8jgjiUznUku/3os7h5xvq0sxb5Xw=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-oKlkgoPWbrT7ReENkaZfN1PWj7NkDhU1Q9LHXa1O1fQqNZEeqkQ2hidjOlZptV/sE5BhEcAeCjjIl6vzIeLURg=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-6X+HPPT/dFsr5a98MsB98F2jrN4aGOAHCbGWyvaY7uyGJpoODgozPd0BiRHZqi6fHRn/ykEijsoBss9VDqYIfA=="; }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-a4S3oDY93J73dNmHnEwMl1AcYzlGFvNIJVN+oSzxGhSk4BNUnzY6Dk9tdNr3jDX07nD1xkvlQfW4su/FbY4wxw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-5n4z/cUu4Vn9Zw7EwuL80Rb1SQky6sc5D0jDYO3AtU5dVCGZ1rIJxN77NQBHiJXGv8GYRfIJRoJs2ygUXRHSnw=="; - }) - ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-hwO5tTllyX69qeI+ttGWCIrlE/LgpMz1COGGQ8wWB94G7T/pF9OfL5emLxlDjc2bhiosh9vNTBH9qY15RYIAGw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-JikxGQ5jGAcZZuxnzf6ptRDZaxJatrDFe8jjs8Wk11ZOB2rgpPIWbKgKkbMsZ6ASJhDgNRdaG4bMMKoR1JUodQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-oSSes+mvNzDaym1veBppTyKtZpFyDssRwATN7vdMcRweFw0ubVPJCpo5fnFmqLxG5U54PABrIy9jJUa68blhHw=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-JYLW2MD/llna3yW+KiNO/GglWgNfGxelfDP8JeTA3Uz2Dj5yEWxk3kPRuea+Ud3yGTvOiElYwYtSjvrHLyRLyw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-qbBF9p9k1i1UFBini4zHBOYZc07teaa0pAXhK8aBEg5FbxShR0z43npXyUKYF6YHVfiYQ5S8r4WsWKDusjUm0g=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-wnf58a8gyniOGvNkVqOnzTxJ2Wq4iOqYLtNj3Gy+axG8LCDEGBptPEBixCvTx3cO8klwAvvBCOvPJa7NaGcDNA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-cP2ujIMhlAkvwoJC+iQgBQl3GzXeVfUZjUSwMt9iXqfwPBIg+g7gNSobee0IK7DQcBKitcnWRY4qvHA+MloJUQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-aYNS5Y8Lgs7o5OON76iQOEMsAIE/DC5V6TTT6zziS/SdfoZO+UqIDn2ZKTovwRjjjM9Ruvd7GLXRDnN4D9aJWg=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-Gm2ctdapd4yqa3G6irUQ266+VWJiFIkNxxJO/xYX72QO0fs9w8IEKdwWSUyWFwxMOMv5x06yeSfNaV2jmOF22g=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-G22Wybh3xwG4wgkciWLOXF1V2Qh/hO541/K7biCBopPtWy1HKSlWckyRks1HoDofqYeeaU7wu2n//G0ntewlPA=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-6KI2quzQCrqmb8gCzhKd5+N8E8SUMtp3YQCZVUbYV1MBr+uIuoPsxxJ8cV+uAzXNjYA2naqdQdayMG5qUw8nLw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-KVSNM7gXfb01Fr/bftCHOGCcuGJyWKMHPITAE1qjjRDETp4MkBhitYYX/UXs6bxQKFpc5/nivuqwqa7dcxbENw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-mfuow256kK9eYtZA/Wam7iZxDSK9wwOKs9gAWB+9+oZZLHEsVMmYLfKDRXf7LBpoSi+dtjiMD7LfV39zrtqKNQ=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-Sp78xXJg9HvC7jVd2D0f+B7Lq0JnvJ0vgz6MrdgbLU/mLZP88g6wqIr7aYkRHwc2P5OkUvVtM26lG7AQIPzYGA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-bwPLwq/rj4aHjoQjlk66i0UT/amMoQ9y1Ey66gRGzQyHZZZAuaFdPHkzM7JwyfvqPXTQkAMD+cixp0g7gNwo7Q=="; - }) ]; }; @@ -468,10 +165,6 @@ rec { aspnetcore_11_0 = buildAspNetCore { version = "11.0.0-preview.3.26207.106"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-arm.tar.gz"; - hash = "sha512-/sfiVEck3I4F24pFKjd4MidXLw1hHAADOb3U74QgYEVEYCKU+7spyRIze8smqiEW+2pCXvSkoUeey6Nk1pNS/Q=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-arm64.tar.gz"; hash = "sha512-7wbJJQgr5bxq0P7AqzPP5HlfltWuJT35MOfM/6AXZD7cYlwn/C0mGeaU+bv2eOQxq51hQ2KqYW6PwYyORNbDHA=="; @@ -480,18 +173,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-x64.tar.gz"; hash = "sha512-YWlN4Oj3rExdqgOmo+2/mSQana5j2cAhU9kd+d9Fs/2y1UEgMNblL1LCdYLWNq2Ra1T/iadXjecka3c7/XZMBg=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-musl-arm.tar.gz"; - hash = "sha512-2GKewfZCwsZkUIDnG5Tkbb+WyPC4W17/9A7S5DNI2k6Ff+y4HvI2n/4fbeJq6DyQnGJRajvq6tR36hyaQFeVPw=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-musl-arm64.tar.gz"; - hash = "sha512-f9q1IpuptkEKR0a3VNptB1iD92ZRhWQ652OV6KRbPpjTE/TJ7kozVn5PwmadDmAUcSaohyghlYxp/nJCiPq0FQ=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-musl-x64.tar.gz"; - hash = "sha512-uw5RT8FBh4FlTq6eOT4QOFPmZ+s0PjucSKqKkmbLwJX+bLAKxvdSEo8Fm+QlqH0RPI8sxvYPAeu17Bk/GGy3yg=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-osx-arm64.tar.gz"; hash = "sha512-chpOHW7SSvTiMoiXzFYgbXrri1hL8irvHQrhE44vKpYk1U40uIam2QHTnvylhtbptzA02EZmfjQ7NURXUeDgJA=="; @@ -506,10 +187,6 @@ rec { runtime_11_0 = buildNetRuntime { version = "11.0.0-preview.3.26207.106"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-arm.tar.gz"; - hash = "sha512-pV9APsVEunijRkEVPlmZJYL9IW/vmU9Qy+Mc8KAsfPgov3KujshjzgPfzki95CxGQckSNwBsprQQC7MaAHy+tw=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-arm64.tar.gz"; hash = "sha512-QTXXbJGgJGjO3FnJrHV7C+2x9Yk5F2Aq/d4qJiIaG4KP2q7+92SomqUyAR3Pv3hEc7d0DJK5lF+RJiV8MoSWnQ=="; @@ -518,18 +195,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-x64.tar.gz"; hash = "sha512-Qk3G2hG1tq0phI/qocAV2jRIqAr0q5U4MqjwUifK+LFtbvxPADtnXkfrI3ugXxVEBlUGye433ZnnAfXf1eCfOg=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-musl-arm.tar.gz"; - hash = "sha512-uMBduqLNaeeds7uwC0DaBo8bdx2WBj4VxILCWTy7p3qHT8O0KifAz57wmZQFx3+i+k7auYu1OtHKbeZIxSseFw=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-musl-arm64.tar.gz"; - hash = "sha512-FKB5PUYSxQsrBe0YgPhKsdOu4t7betE7d2OwADfAITsS9H6gGJ5SUpC4EsrXxZ/+bnfctpmMk+E8e9p3FuH27Q=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-musl-x64.tar.gz"; - hash = "sha512-yRDoYBC5t9UwuFtTMlYH4NmqDI1+UCgaTj/m+0hAGuEpWclg9D6/ZVQEhZRva3vdfmkf1041efgO85X9MmKDqg=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-osx-arm64.tar.gz"; hash = "sha512-h8DGOlCEbb1uuzXtXlcD0fag7xGEXbe9lAFORo9UcmaAbDQMSE0bagy0VwCdlaK47gR/fbEdqQ8Nz4TygTy+0A=="; @@ -544,10 +209,6 @@ rec { sdk_11_0_1xx = buildNetSdk { version = "11.0.100-preview.3.26207.106"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-arm.tar.gz"; - hash = "sha512-8Wdgso1ktVy/qzAzFouiiB6SjICd/61olH2TJYIC3gG+AIKvLjYB3EyT43qPCZdMSzvJnZTt6I8vnqMySqYtMg=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-arm64.tar.gz"; hash = "sha512-lgL0cIMGlW2QJ39uydsJWDprRnpZWIuo+pWZQODCVZek5YUMP7xcUzvJxh/DxTMJsl5GSNii+ynFDrDfRlO4iA=="; @@ -556,18 +217,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-x64.tar.gz"; hash = "sha512-A6nmiA7NBzAaKuleTr6gDfdYqAhDaDyjo1xGFd8ySTE5/KjDuCCiKF6xVY7HGS39AIFlYIndDSJhOL3GuY5SGg=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-musl-arm.tar.gz"; - hash = "sha512-j3IMukJ+JacaLbx9nRXhpdmCMzhz3N2uhMzGO/v9NZiuoazTcjnegupLe9Xj1vHC8FVPUPQNO8ZwIfjrX8XoFA=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-musl-arm64.tar.gz"; - hash = "sha512-goZIcjbXLoXlP1zF0ZJvL6qV9W05XrQEV1dgeHvAd0KnmThN67odgxp2KoTFTw40TPx4a9ehuvRc6lw16ldveg=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-musl-x64.tar.gz"; - hash = "sha512-cW56k/pBrVnNAw7QWakLaEYxs2vw7OZGRQUV35TKgVmH2Ikl4A6ygbzLl7/3FS5pJgqbgwyROBH0BSzERSxY0g=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-osx-arm64.tar.gz"; hash = "sha512-whvgDXbhNV4fiNXn94aBPpe1Yf2MwQQ1b86ic8hVOJ1Ccsjz4n3g8Ne3WVafLHg9QtGUWQ/6lZxGo//4MXRhlw=="; diff --git a/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix index 0ca7135504be..76f364749f16 100644 --- a/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix @@ -9,41 +9,6 @@ let commonPackages = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Ref"; - version = "8.0.25"; - hash = "sha512-UADgNn3jhsot29Ve5n+8E/J+At888zu38dfKc56TsMIm/Kb0ncgfELgYwSwUGpKI/nASq5XHow1ytueakD6XXg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-QBkofLhL1n2YtYtfsIPGhfH2NIr2su0QXJdaX2hmn8BgxCuKhZyN6vt4pp3rHxudqFT4xJETe3aK8UiqQDsSSA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Ref"; - version = "8.0.25"; - hash = "sha512-fqnJNvz6zQ6c5ZAQoKFKMSDPyNX+7qzn9KUOw+a0PSlMDMBVj0wiXHyuo7aqVq7whII6kd2ZY9rhbhRogeUNVw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-Bzai3fUDV4ffDKwBEBF2IhvOiYbKUKFMnbroIeIMyHs6TFMqeHKLJ3LRy59HZT1FrV85gOnFJ7ye+BD28dvEAQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-d6UrXl6WRQsVr3dvW+pMJs+N/lPeDVOSum8VTkgBdWfFLVPYtKhrpKEJwdM3odmBqpcwjQDtc6Q3/8yz24OsHQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-ZnOPTA2KMqFVZ+0Je41JBUMtj3jbt8jbqpdyWrJ5YvpDH16aAb2bCZ3t9jjBqTDYK8hi3GKevkEouvbbFKzQyg=="; - }) - (fetchNupkg { - pname = "Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-GkqlIMmnibU5KHYtVcYLYc5eERO7Ql5G3xgQYG2dLdTOYBiSwNmWbg2VljJFF7XnoZ4+iWyVekZbkzv/0auQhg=="; - }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.25"; @@ -52,24 +17,12 @@ let ]; hostPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "8.0.25"; - hash = "sha512-yfwiS/eIzv2WVcTwtFvJaucR1r5n4pmQ1ae0SWXAVS6KGVGUHjhRnTyOCivuXcRzjGGZgQH7CRw/2WfSIllFdQ=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.25"; hash = "sha512-0cmoZ6fj2gbWhC1LP5XIpEXwQzlsqWlDFpxjUgwv/pVLe9HPeJWt5Q8Rqui3RO1QNE2CLqrMoWxI85b/apKScQ=="; }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-2906shiCKrL5CSvLaUbFHLr3ZmtRZUfHiAo/EIivDZTJcfliWd27bvGsgVm0R5tSP54E9urxrLota6pOCr9uFg=="; - }) ]; linux-x64 = [ (fetchNupkg { @@ -77,42 +30,6 @@ let version = "8.0.25"; hash = "sha512-BkKYjJoeBKLKfYHhmqIDhJ3tHlQ9wwDAq7NskffCgkaJh4IlCBMCWUDXmr1nNOW8NxaONioD2O0tBZ6KhzQ/5Q=="; }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-nhohobVJGwv4RymT6JtleO1yxFgp0BoSJKqiOHCnybtE0uxIs71mVp13RGsgCvcWDV1EQ9GUD5KHbhW5a6CbdQ=="; - }) - ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "8.0.25"; - hash = "sha512-soxRquFCYg4YJaZ8CL5LWWcjphJTCvj93vl9a9PMNmPjnN6X1ZxX+75LdY+ogrmb14Sw/qogV2HNMJNYZ/wbHw=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "8.0.25"; - hash = "sha512-q/jFyTR3QVUi9rBwcbzv7ocvdZnwBNolcv+7evQtI0MTRvfi6f5R4G9QC1roevAGJEreMMqs+IbPPwI+X5pzVw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-fraXubuYMdH0lR5Qnj79BWnrgYSWUIdZsuR05Q1Gr7w7EHwDU1oTxk1R1cr15d4QECQfm1AY3ZLMSwKHE+GFSg=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "8.0.25"; - hash = "sha512-qNWyQUL5ibXxxewxNX/6XarFtvNIfnrodsAL7F+bRfa9jzoUTlvwclg8e1dyEA4zOeOAcivdFuROJ7bZfQ3kDw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-d2PQ3UJyKeSwu8Oq931+tOKC7stEFsotdEnKbHacd+powcm9gFiNvu4mpUNk1Qha0v9YkEFrAqvjXS/nt3aRqQ=="; - }) ]; osx-arm64 = [ (fetchNupkg { @@ -120,11 +37,6 @@ let version = "8.0.25"; hash = "sha512-rr6lj09G6Mk3P8n93Aa7XGHJ/2XchaKgF8V7QtFgfLWeIUdjNVzq8him26sOQGKtaMXn/hLkFEyweu8carA8Aw=="; }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-DtzolCQpaL3tGzUm5tSEQ8+J7Q2r86zpS1CM6jABeOChIDsDSwfZ8oXvBflybSth7JEnwvnzQWOVov8Jhru6KQ=="; - }) ]; osx-x64 = [ (fetchNupkg { @@ -132,129 +44,21 @@ let version = "8.0.25"; hash = "sha512-k7mqLNAJItPKfPPOnoPI2p6cpjfslWkKk+8KkWSPhsJRMKnR7/8e3f8y5/ToZ0oEfylxyOoGu1SFE62eMzfYDw=="; }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-8FTqcOAKve2+v4d4G3LUK7yU8CmW98Wv2b7YPMD3WH5QthHcnecJiq/y/kiA8vNG09Ir+DauJK4Ai14zY4gDTQ=="; - }) - ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "8.0.25"; - hash = "sha512-rqSJrkkr7OnfqGiqbuCTuBbMwJq4ITzT6dLR+Qz9wEA9dG5B4iI5C5IIPIp+7fO1BkKS+mCtR50sZ2K7sxhEXA=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-HfHw4m9FuU3+f5URxlMDi4T8vDKQkdCFR/BMtsfq+84JTAPINqkVFjwdtC6H+sXlX2hA9jGSUkjrwYm0GXdjGw=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "8.0.25"; - hash = "sha512-bpXPJxE+om30rajR1IA1TNqF4IJi+md70jLMItaQTChivdjJOVugHZDRUJCeIVp4rBglBCSutqH/FLa/xo1Lcg=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-yiU1skELDDaZcEzHiHBqq4E6pRzuoam3hBLicFx1yROyN++y203yiQDH9nEs0pOMYEZOZQEMqUF5r0lb70b6iQ=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "8.0.25"; - hash = "sha512-eZ9rDYrduKOAzA0XvmJm24IDsI0sDUfgDI9JhM92cDztXaHenaZzlDFESUZJEHSbEiWx9a0wj0C8nS4BMUzCUA=="; - }) ]; }; targetPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "8.0.25"; - hash = "sha512-30GieR4glcXhFNWNdJAb/JmKp5xTRk0rt88pEwa1XZjpM5Kzjo8s/V6VxMkePPD6k0qS29MrpWE4wqMe85htew=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "8.0.25"; - hash = "sha512-XEuocp4I6d8A+8c6t1OyDl7qDs1zV6/R6AGV/lu0f69cXItdVxZtLvDjzYW5TBeQ9Tx0r5PH6Qid7Pq/OQZysQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "8.0.25"; - hash = "sha512-UDSHypbfdYcq5mzR6hDGKmvyDX9Rxg/qKfWsbfqaJcqE7Pz7PbmBzPvLpRc5ctllsdH6Gy3YPcRuUPuHZFNPOQ=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-GIWmk/+AVDyoJgiFtf+FcpDSLWpTtE4beLpP22qwIyE4eFZzx1qDU1Yr5SRsDrSmgf5F8wrf7IylWJs4jwFaXA=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-D96Tyfln5axyYUnR+HkaNcaQmHwU8BpSBDyX6XKjlN8Y8NpTdLrBjbocpe00PHdzX/8QuryY7lqpwtG0WMW5BA=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-daYe+APwzRVJbJgI6hDok0JdiVpT3d3ct5wlA7reVTAbPt3Mp2P82FCzWF9TigAjfDjC8cXvFYTsXMJoJqsU9A=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-T3n/RBRo8gtkFpFtul9CDitghlBTjmRny4jb3a/rGiwpvzAo01b9hDBcnk+CcAoOb2CPvlbeleuf5QRAdPGKyQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; - version = "8.0.25"; - hash = "sha512-OW0ECKvCxfK0SPLWgZ0BA7gXiZUUjIx9KzBklg78EGZfiP9EYPG+glViqmRkqc1gERQKTuaMUdEL7Rhe7z0lOA=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.25"; hash = "sha512-7Qa7XvKR9VSBFk1dllIs395MQ4Gxl0RJqk6cyBAlG1PpIq3kju+4u01ug7C4eJGcVcjmzRMZO8YIYRtpyN9pdw=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "8.0.25"; - hash = "sha512-tYBwWufBKmR0yWGZ6VHEEFQA0z+7n2jpfdphH37KDd/qZy1lgyut5ArI3JjTtlQYQgfL3hcV2RN4APaULYl63g=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.25"; hash = "sha512-nFnoLX+jwF4HXUC4Jry2mK6BBzbm2LTGw38LyhqFRzcEpe8sfNsihXlHx+d+XKnDy/axQangzRi4C2LZ0Kg+2w=="; }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-t+smpWUJHdEv98JlFYD2E1C+BXyFczA9LULzy3ZDKg0XBVp/zPmfo4pX0kCCCTfpmosShttU2UqEbIH8sFCDSQ=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-y7d6pzVJsuGmNki/MXfvKcvZXMC2ycRZ+fG4xRQXEQu+8WvGqcx7NLEAfia772iQS4LNF1C9bPHZlVUDXsOHoQ=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-sTmuWB5gKE/5H7HPw4rKWlSOToqgwmbq32KvmPOUOaXG1DfPQJCqXwhIuCabL579diYq1v2eGw1e1dVWdKuXQg=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-LdtcUpGlqOC0cBf1ahtmYdQf5TOl3oFuVDk6mTkuXNUhXyF7ZWtrYODU/TkSRjr5QiqQimHSOuK1y1xHer99zw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; - version = "8.0.25"; - hash = "sha512-8CSPcnFMHKkpJjCUS7GgWLWmjfqH9AtuMzsnPNwe+lKIP2HxDwgd4Q/jlliZkv80DQ6YbCRSjSCTg4j+tVlpqg=="; - }) ]; linux-x64 = [ (fetchNupkg { @@ -262,157 +66,11 @@ let version = "8.0.25"; hash = "sha512-s6WnkKOwSSD1HDmQGrk/VOEy2JH0qUMp442bc0MAMLdzvZOLp3ETS7zObJ2kBmB9TqHEjzcybCjsNbApoLDLFQ=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "8.0.25"; - hash = "sha512-vaunU9Pxox7xBrR8hJ2THyifEbu9d1tIG5eXqr8XTZIxxJiyshvYF5nn0uiTh1C/FoogvkllTe4cjsmcqBVqUw=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.25"; hash = "sha512-XJTKpxcUhrLt7TaoBELOb1iQUFYICtakHa5pK2vTTgcsb6GpVxYFvzyJDPDEbMdK9s6/iyKysWi1o/MUAE3qKQ=="; }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-hn4OAd2trVQi3EumT8EOKL9N7WperpZ2CR7YLeob8zxG21kLDKzbJi1+YkS4S/HTIt5o6PF2+ag6OyzBte3a+A=="; - }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-U3h/rme/6rxpB0yY6RV0NB18pfkEI/BNkYvRYayVOiUzUn8VCpoS57MXb7ybGuzelBnm/BTIkvOCPPUgbOTpPg=="; - }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-V1Y/+La7P6tCf6IOI9qsk3YECGWbNHfkgiq2UImqw3VXRUolrsabSnH4Hfuct3UE20zINc1ht5YzJ2N/Dua5wQ=="; - }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-EMJtrTcualEAZfCJXlCjnQLxCApd9ChdauEeibxPqclYfEhTULXFKxPUHjmmFmCd/IwdDEVSNIXz+RtaorVC/w=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; - version = "8.0.25"; - hash = "sha512-0WLXarvW7HeX67KVelSKgZ1gwaYxbFgJZRSVYPWzGMHOsC/CKlL3z2Nb9JKsEDuveg0RMa+VrzbNyuygXEL8ug=="; - }) - ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "8.0.25"; - hash = "sha512-Ed/m7srCdqbWQKnCHN/S9LoeeAtenbW0q7sZ3t7bEkPZqQeoYl5x4AXrjTTFyK0+v7G7xFpdDU5tJhLCjMAZdw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "8.0.25"; - hash = "sha512-mKFajoj3yKTWCflyBZui0mVyLyP78xOTdkyW2NPz/Gs2+qaEZlZVZ+0RJ5BWLjL82rqKnF9ATBSolMkq1pIbzA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "8.0.25"; - hash = "sha512-462gL45vRTFbJIjlQmA6NkxnZbJZxXvtv53iya+SQQ4VM15gSgelR9m8y1MwDIciqThtD5x3nm+3BpamPbaryw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-kMo3dz/KtKjf1npo8s8niLjB6Zk+QSOaAQigo6Gm9kvmLAe8eVlyrqrUsXCGK/leNdiGDWzch0L+nxoATpKSHw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-0WzPkm4ykvpRtHAL73AzNOkU4oUB3SxFsCnPHV9WkWbpG8dGJri7Z3MweCucdnffA8WyIcaG8R6lwCmgjGgp7w=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-q0wy0rMPDDCRRSjL/D8tEovs+SveYQL6pBa7mME6u3JgMRN9XP/PQwGnxahS5/07/D2RR9nAK5qq9xhudv34FA=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-4N2e6Bmw8d/eLIisGGvc5wkdQ61cphwfNGgQ/99Dsfr0/kl3PMovG8XscPNEmZHbKPWlb8pfCcE6MOiBSomwEg=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "8.0.25"; - hash = "sha512-DEaIWo8h+bRnPFsuO5F38+MCaSF1tnulteC+6d6LeDoC54W3K2qUFgH+LR+K+pSxu8BMSzGNSWPp2YJdcZ0GXA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "8.0.25"; - hash = "sha512-oAI0pinclefbjLR55uxCU4lQzJKuSwdbgjs5fgGnECmXaUvgXhtGfw2ZZqs6xXNTTrciiLbtrj6xVtnQc+yAMw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "8.0.25"; - hash = "sha512-R/MYKiITDkUwmgStgZj/pQIis6EYrhpha7pqtgh+BUPN2nOY9r55ZgniV+fnekra/79UF+7ckwvZhAi7qh8/Yg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-cJx+UGgTgS7eLtctXtY1asaZELK4MoAp45tiFtSv99uJPTYuTcPj5nql5c5qyV1O67+M88j1COg0df/b/ADdbg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-eawUKDA8m6mWR1nC5xz428CU9OpFDheRDAAiF5XR9BPOXwCGk/lnnYfybFQ2owchPP6rRfpy3QPo2Mfh4Uc19A=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-p+pERqwKzLrQuD5bLZ8Baph/wSBlVenjTols0os4A/UzgJFUFPV3Yd/bwIodS0Xu979kWdi/T7R7UJ1tIDprZA=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-QVvfHc1zDq2q/BfEMVi2GZMI2Wh6KnNFRwhwTu5zvkM5UYJCOveuUD2vtR1Y0OYKJDumD0wdzvvGh+xNV27gpQ=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "8.0.25"; - hash = "sha512-Kwf6rU4HTiujXCinQoLoMwT6tNU1mlSI/1Sg3dVTmPimhVevMe4sBJ75dovoc953W2HBrpGKLwEQY/Rnp8J62g=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "8.0.25"; - hash = "sha512-ZsUjIrLEGodtiP1D9niDnCehUjn3uY21cqVxfWW+qm8pePL955R5pdl7QEN4uY4xIAtuEFPfiXUWb53XjyYcTQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "8.0.25"; - hash = "sha512-cUilAUpHG535Zs+rW0w0VkaS/MbjgjsLGssJKdyFCNehIdR+4+RU8NM8eQNIZaURqkdywu9mQHECfH4Yk/1NQw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-SJJ1dVtMi8OC3/BROSdUbuiCF4HcZiD/U4eH5OPjW3xkBsp23bONvjAKHGwogK3VC5ppolVLSHtSKxVEahqygA=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-0H2OFbTbBPsf0P2V5DXfoZQ9aB/NTT7ptBVu12t+hn3p8rTztSOLKvgFkB7W4H/jFs/q7gx/+TdxrAMH5sTI+w=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-9nsf3lm+4E3FT6tB/FJcci0d6pLRfpvacHEFYyfQIAn0CpE6AxfNaS988+G1f4whvf9BH93Ksr/6zid2qYDZ9A=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-A/l9S4D7J8+b8aQRBGFLhFKvA/hursAM+he4b7H6sacsqLBX1jKdKUJoN1PbS+uhSg5mLSqUcmOJi2RuVgvf8A=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; - version = "8.0.25"; - hash = "sha512-cYltFLxAUdDdZ2xkHGegVCRQLz0zD7jBsepmLKCau3G83jNvEk6ylI9uLlD731+LRT0Yq14oydbSxAQ/yaK6TA=="; - }) ]; osx-arm64 = [ (fetchNupkg { @@ -420,41 +78,11 @@ let version = "8.0.25"; hash = "sha512-9l5Gtkz1kOH+cLgUDnmYDoIXB75lIQ39vp/6DlyRxm7PqNLBP3PXuNNHnGJ/cyvy5nER6DExV45HCi5A1aKr/w=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "8.0.25"; - hash = "sha512-d7Uv5YGawAHbFPkwIz2RuGDI9+74/zwUOdF2AOZ/tOIYmn01xXnVMeFrf1Z4FMgVLFdA6nZTAMy0WFANXojhtA=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.25"; hash = "sha512-UcgDIJx4+Zh3yNrnwDJoXlA9IpugIUDp0niYFyw/U18c9jI4MT51YGLGlI7vy7IkOVA7O0mJcLABrABLKlcKbg=="; }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-KLZPRcwFLqUil/QaPIE0CSXIXM5e1olDQOpWXjBWkPuEj/8zX5A3PFuiowG+8yoC8r5jP8RzjwdV0Y/qeAsfaQ=="; - }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-b4iYO3mLGUU7reVLhyji8jm8ocWrA3YC+W2bUxQtbl1xCw9jEYtVdqTXx9HNmE/71mGDVPHSvgoo1tnVagVMzg=="; - }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-rWtj0wYv4/WfBtHLiaUfNkHf1j+fDGqbJrwus8vPJ2SBdQhqdhJ0km34tZw6yRqjE8/QK8ZCnMW75fuXIvO4UA=="; - }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-Dy1knVjNSOsXuo3WiUGeEfTFM4pZzc7RU6fClGJ6QY//B5wxmQ9O3UjTO563XgY3zdxqqAIiU2+PRajXKMn3Ug=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; - version = "8.0.25"; - hash = "sha512-BlhX9ZFiZiLJjsnd+u3Es4SoF25Sseh13xVRuX9qSj+zbdDT0WrSc3AqKhX7T+iHYHmOvAhF6hVioCOXX3k25g=="; - }) ]; osx-x64 = [ (fetchNupkg { @@ -462,162 +90,11 @@ let version = "8.0.25"; hash = "sha512-c0jEySkvlVvHmH1Cst9CK/1heZt20GRwOfItWm4ng513VEfu0EbbJ1Z2UYxgBOvDruCdLv0z+lLbS1yxZdsyHA=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "8.0.25"; - hash = "sha512-aAwELUtrEsgixKnFRYquT4DFu0DPevr32SfSI+hkjF+v+TA5bbw5vJehfgaa/g5ubWsmgsoLBNXfmdygI74e0g=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.25"; hash = "sha512-iufUmvbhlMAtLdFwCU1LFA17fFbhE/eYg6dLVxmPxvwPDVEyOoJqdlWQAH4vvOh8A2gTbEG56qSSWDKmUuq37g=="; }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-qILNnBa5HVaQK3Qnt13nUcpU5RxAjCxnmXjgBE6VgVGC5vInaj6piP5nOEMQgg7qKx8Ia7sO6b0zNfpLqpX2GA=="; - }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-jojJqpPkKEfFpAR85UmaCA7CfF5Qg/QOUI1lYNLGb+uhci7QKLuljMNpkM8cLB3oYXR8rqtO8zW4VF/WWXKGtA=="; - }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-GTM9x1fhwXHEb8C4SjoFSaFH8jJJQtjBngR1X8BsPmSzQw5ivbtzquShitymrmBZN0wubh8VfqBW1IoiNRVfyg=="; - }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-awiQPtoO8oeDUfXublVnsv9NL2RnI+CrX3Gkffv/c6p6Mgu1bZvCUfsWZ1vigib7LMEHa8aksTtiw3rOSVxazQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; - version = "8.0.25"; - hash = "sha512-FoIQgcIP/UQMIgPDglDd3CwTeeABeHbeZwo92tVikOHfwRoZfJ6tU5CsouGD5OCSQp1tAA9NUqDWUTZw8zChDA=="; - }) - ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "8.0.25"; - hash = "sha512-EpzOSe9pa+WjHW/P8+3J45nJ93b/ip9M90jn0R+iB4Rc28B2Pyh0jAtTqkHZOp5oMtznipWY5zuRmXbgFpUzAA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "8.0.25"; - hash = "sha512-Py/14ZpH+MnNYQ+IM98CdSGOAu10qI+KuQpVgPPUnPyxuTqEsI/CG2VeHa1l7Gvz/BCADkQo8FqgNJu8323MEQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "8.0.25"; - hash = "sha512-gK/53iv85vbUPb8CnLh6PPWxS9EHwtIPPPcxHFKTgNPO0mcXB+e3P5svSuEvfe9Yp/dE4l2E9UfDugcNSa8JxA=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-pB1agArWNDwpK1dctWYsoNfUkQ9qUH8J7l8X6ocVFfaa4cgHU/MYT8vQ1mfjIPEyXWC/ljvNJs74lqnh3jhybw=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-LFwA+JpKwhlFLvZXnAUIbIdTQCRCOhBUHBIzonp+rXEvXx0I82z7QZ33ujNoXSa8VZwmhp33CILo9+u2gIg+Lg=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-/iBO/75csujkLRenu3NrcuISyNpiY3NucZ62PXspChFZxI/2Hd9HPYSXrxyjcbiX/SXlFD/zIyhpQtfJzIxFuA=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-hq84uCcxOWYHhG/BuezuMbjeuZZddL72p31TwE9K4WWWnhoiXBcDsZcc7j43ClxXtlnSZIVvWerDfZYfRiyJRg=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "8.0.25"; - hash = "sha512-gviCU2Sq/CUzGDp7kQauzbMk5cpoCgN+sh6FpLLGJ4IVchyeqq7UQUamnHtqIGFJdPEsqdZ95cl2Sdh++uBlQA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "8.0.25"; - hash = "sha512-ausHdlWALgtBF+mvt3vWiSZq4KqTreVPmDtHMI2uarGb96M17QWu14uhhctTrGsPBcc7x4hTYBuK9V43ArUAFg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "8.0.25"; - hash = "sha512-UkxLgMmbfnG+xF0G8t1Pd92UII+9KqgmxKNzejjTW1Ox+DCwrC05MmplM76vLsDOdaO87is325RbtdNRSaiERw=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-SKdopTlwBgWYqPT37+5Pbe6IKmznsrwA1zX7kua4PB+DdbmkS2b4nYa9DuZIgbCWWL3C+mjloxSmFzK6lOBAhA=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-yBgoCW+BBdwC0syp/FQnIkvehxFuJhPPrIoXaaOfMaJdABNE2fV4QZ7t25um+GKAXhQSFYASXZTk94nrm42KVw=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-A3bIR2BHvxFOoENcWP5TqJAuUBqDwOLgK3fa+XtFWu0Rtp9ZrYKyRoHVbqqHirWWvzN0HWOZI4x4OaFas8kfFg=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-h5Ek4mjDjouQ4ZgoC9W0kh7WzwYtpSJrLHjiSUkMu2SE9/n5lY27kRtPe+A4r6rzLfEEd35SToq20nO3vK3kYA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; - version = "8.0.25"; - hash = "sha512-WSkPeQpku8Ur2WKUsHMX7vxa9vmxSNw3XtO2LA/9HxaGXqgHo9LVCRffqBxIjz76vKqvbWjZjtTj8eQ8KaTtYw=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "8.0.25"; - hash = "sha512-n8aPpFWVirne/jRH2/w9+q1+mUzyqodJWuSJBRi2LvvqR25LcneuBOk3fvL2QOn/HDsAOoZ50weP/bay+iar+g=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "8.0.25"; - hash = "sha512-5dlpmlUU3S3Y7yB7XfS3TJZBthw9enB6Jv8I1QptRGtVr12wVljSmkUbUE5tujou5im1hhlxKA4LKO98tGynHw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "8.0.25"; - hash = "sha512-pxV9H1TBTznSSjg6EJUwh6HzAHN13sPqSFcLznfoTeDiq+VFt+vbCbuGR/QZIW2fiT85sP89r98t0BZlH9JG8A=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-IZgxYw2JOLsXiDW6/AEi8C7GfbPllOsHssqcG9PKHAVcwlfhfVI+ZWjwHJlT0Jgv6239+2NKKUxMje1g79/UJw=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-qX0vaUvmMLiyaQ2EUI+khMuZ6R1lR2HLZAUBTMvxlOPccfP0VoYxQKEZFKp4GuyHtwBdGZTtPB962wz5hhjveQ=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-GNutinDHEuMwy1oDYCZ8huW/0sfCDHNwE8/dKXSpHdAymYcKqMZ6za9WQDyh4ZxW4LtaHKtL6/wDx2ksHgU+NA=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-cJbqrcQRgzXO0GfH93xRApzWTlb/lXFngDc2W8ExcLMzEOcF3nZBLhe+w8uYKeqhcEM++HzzwY+vWOPllxqvaQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; - version = "8.0.25"; - hash = "sha512-qVmF5yIDylqNTgRgpveqPK3+QYeLmKR8ADQLi/uUpOebXg5MrcxPdxM1UiYlXLPzilOxPfbkimrLmXGdHEuMeQ=="; - }) ]; }; @@ -628,10 +105,6 @@ rec { aspnetcore_8_0 = buildAspNetCore { version = "8.0.25"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-arm.tar.gz"; - hash = "sha512-2CL6ZEB474zJGgC5YSgdYr85JsUwwgmMSOKldg0FJjYz+E2UAYzPbJXJlVNhgLscn+Yfl0cRHqyzIVrAlIeAxQ=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-arm64.tar.gz"; hash = "sha512-Zdixa775DETarJBqr5KBj0OoSCGR2/PyC93N0a1gd9F7YXg2S9CCSVAd3TAhpMj1+YocA2DhJocNsUzwbNEnJw=="; @@ -640,18 +113,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-x64.tar.gz"; hash = "sha512-3bZqw2YlKrOCJxJBs+U6dSAdLISMnshwon+xeKbbGOTZSbmJaj2FMNA9JV9P1R1jU2e+3aPZ88Z3y1lnhNvLnA=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-musl-arm.tar.gz"; - hash = "sha512-0vNZqg1Cs624UprqiWyXH9+f7tDmeWZZAQ37Uc8VO0njBifgWkjwlWKXNi+gWaaiNlXrkYXjmfFT5obp+C7N4g=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-musl-arm64.tar.gz"; - hash = "sha512-EmsxuLof4zZN/Nk4jHJGX6ov23slHHgxCG7DF081YHXnIG0z9I/BrjfDNdyw9zm634JSE5Ha00xkCh+xlynWGw=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-musl-x64.tar.gz"; - hash = "sha512-mUQw4j1G/GSOqWVzscqy8RWM/0rtf9PF3vUrTmOoT7FjWr/ugyjS+TZu99S0LdzZCaagKK8TeK4OtUlQSpxXyg=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-osx-arm64.tar.gz"; hash = "sha512-J4g4l5Dea2BPrvUsV4WewpStGYzV3ZuMSu0VoVy4E3ywUgPBdFaCeSZXPc1mvGOqyM7gXSg9hoZ2BC1HNZMjIA=="; @@ -666,10 +127,6 @@ rec { runtime_8_0 = buildNetRuntime { version = "8.0.25"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-arm.tar.gz"; - hash = "sha512-HRg683h9wTLbngLRh7nNAZzwOkAnU/pJIbNHEeOMX5FJSwa3nxB3wlvFu9ipj7fHjEOy5rBKedQdtTGFSrm+7w=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-arm64.tar.gz"; hash = "sha512-7tI/mVisrdxuS4OO7XX9M9LFzWb8Z9CWoFxgvMiDWYKInSxVlHytxHybz8PaRl0wf3oD4NOrZoKxYiM6s7Xcpw=="; @@ -678,18 +135,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-x64.tar.gz"; hash = "sha512-pd4hhX/lFp7HjHBMcWOp1kh6dVOWZRwkEtJC/8JhTHVxGGysTDtOTJnnvfcWZ20opZ1JmGLGpv17gYDR45lzgw=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-musl-arm.tar.gz"; - hash = "sha512-LAt8fu27DwYLF/Ir3BGNfQuAtfeC1MOd6CZDYpMhQgJ9Sa/ONs29hyLgvYKLwWKl4eQH2MT6DTJoguQ9ZVazRg=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-musl-arm64.tar.gz"; - hash = "sha512-Oql0IFsj1f2tF2E5H5LbAFbpjcffNPvNm08Jq8pHAczXVyaSuzonxIsffa0ncL5QniS8iauojCH9JFDcM7jFaA=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-musl-x64.tar.gz"; - hash = "sha512-Kqlnc4rgRGHONUy0hlgte30u11IeJlusD88DiAM1ZIOo/CMuQ5a0R8tcVbGLNDcn57KSKsVmHaO9LbXeDHMWow=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-osx-arm64.tar.gz"; hash = "sha512-0gNqLlM+aIoVFkNJPCVIg6lV1U5QnjDLuHuQl/eMpMNu4rgDoDEM1XGwjJqFxpRQTyZcD4iE+bDHmNx0n80cow=="; @@ -704,10 +149,6 @@ rec { sdk_8_0_1xx = buildNetSdk { version = "8.0.125"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-arm.tar.gz"; - hash = "sha512-qOhXRciZHNWGzLnGwmLgBp/SjPjkpeRt/GgX8Gp1WaPFpHXSyVCrC+yeixxRaavXJrRN1K4Da8+vuhlcJ0WpTg=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-arm64.tar.gz"; hash = "sha512-sbLwkjJUAcwxK0Enb1DhiLAin2+HQgxkjRqwXahtxAe8koqblTztFad5z8r+6eNPCACUE1aLA5nHJ/i/cbccvA=="; @@ -716,18 +157,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-x64.tar.gz"; hash = "sha512-KXOFSrkK9U8sYmqAMvTftBv+3Vkh8dW5pLaDKJJ+eF5ciqaT0k9zkwTKRtmk9ahAgfqUuEUuH0+DBAqOWCorNw=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-musl-arm.tar.gz"; - hash = "sha512-ld1t8kFRa2ZemOsirZBRVf+p9G1vYcKkNEkbc0Jq0Ii0DlfjkATmI1Y1dYDApgQGLMdKfCWz5LxHGwpbYiCDOA=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-musl-arm64.tar.gz"; - hash = "sha512-+pcYdflda2H82w5lPI/YByTsDL0218Dy1i0od92g8MmU23zLSclJBzkDuoL1gJEDEpUWMUFTuGGtx5uJvjH75g=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-musl-x64.tar.gz"; - hash = "sha512-0YcLJj7ieU4NcTkbnYhiptVdxcbVHn+yxuuzwBerwASmMuE4MQGPUkjhmhXTcXWTV4ycdRxNwg0SNR5ACycTHw=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-osx-arm64.tar.gz"; hash = "sha512-9qxDRPN0NM4U/JiPT756O5LfScjQdXjHBLFBX0BBArCi6kSzmJV570Pi3njluMJSOtMFDya9PrHDGHwnyEAOmA=="; diff --git a/pkgs/development/compilers/dotnet/8.0/deps.json b/pkgs/development/compilers/dotnet/8.0/deps.json index 77bfd48b0c9b..9336bd0b2b49 100644 --- a/pkgs/development/compilers/dotnet/8.0/deps.json +++ b/pkgs/development/compilers/dotnet/8.0/deps.json @@ -1,64 +1,10 @@ [ - { - "hash": "sha256-leB3BeFiEW80loMANJRgtUSCbHMamTXEcLlTAOgHTS8=", - "pname": "Microsoft.Build.Framework", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.8.43/microsoft.build.framework.17.8.43.nupkg", - "version": "17.8.43" - }, - { - "hash": "sha256-dy4sbWvMOAtAeSKoIvWlVMAfLcqQLI1QExFIvdAgM1k=", - "pname": "Microsoft.Build.Tasks.Core", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.8.43/microsoft.build.tasks.core.17.8.43.nupkg", - "version": "17.8.43" - }, - { - "hash": "sha256-/5X592Hw0E18e2SqOxsBLUGcvlRfSqXsHRPfv80MBkg=", - "pname": "Microsoft.Build.Utilities.Core", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.8.43/microsoft.build.utilities.core.17.8.43.nupkg", - "version": "17.8.43" - }, - { - "hash": "sha256-ngvdiRCFgjbBLrc5Fk8fpBPwmsCW5ZJK4TAQ9pDRS94=", - "pname": "Microsoft.NET.StringTools", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.8.43/microsoft.net.stringtools.17.8.43.nupkg", - "version": "17.8.43" - }, - { - "hash": "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ=", - "pname": "Microsoft.VisualStudio.Setup.Configuration.Interop", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg", - "version": "3.2.2146" - }, { "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=", "pname": "Newtonsoft.Json", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg", "version": "13.0.1" }, - { - "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=", - "pname": "System.Formats.Asn1", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/8.0.1/system.formats.asn1.8.0.1.nupkg", - "version": "8.0.1" - }, - { - "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=", - "pname": "System.Reflection.Metadata", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/8.0.0/system.reflection.metadata.8.0.0.nupkg", - "version": "8.0.0" - }, - { - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=", - "pname": "System.Text.Json", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.5/system.text.json.8.0.5.nupkg", - "version": "8.0.5" - }, - { - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=", - "pname": "System.Text.Json", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.5/system.text.json.8.0.5.nupkg", - "version": "8.0.5" - }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", "sha256": "519351be7f7c75add08cc9b16a3cb86ed71acb3e06a8dfa2a6cd0e48a83281a5", diff --git a/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix index 02267a96f8ce..7fcab56747a0 100644 --- a/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix @@ -9,26 +9,6 @@ let commonPackages = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Ref"; - version = "9.0.14"; - hash = "sha512-qSgGFleE4ZvBb3DExY0wkNyZtDeGReZMtn+iM5TP40PnFq3246hVF7m7Fj+moMXeLswsC6+6iFh0rIPRJMAcag=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-oY4TEsvQZC5DqjbkzxFU1n8+XKLcmAOEzGGAH4Xpq5iSDTT49Qcpl0FmHat9eUTa+Hkjqh6De9ewzvQIlucI2Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Ref"; - version = "9.0.14"; - hash = "sha512-nBzLKh7NdmLgA3tUaNZmiFrG3g3FtHElfZi7VE5h1VJJlgPiLehVf6iDUDraWSB9sm23ibSV4z2lxxtxaxmX+w=="; - }) - (fetchNupkg { - pname = "Microsoft.DotNet.ILCompiler"; - version = "9.0.14"; - hash = "sha512-1zyv3HlPHpU4St6gEOHzglfJsTWTdN48dtfLRZEw9ruPI9j1cZ5O/Cj4es635TSpz7VnAi10yFVr7Ye6+vH68Q=="; - }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.14"; @@ -37,19 +17,22 @@ let ]; hostPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "9.0.14"; - hash = "sha512-oTVfDmsgrSyLh8NJlIe9tLkw4aCtPSwLUGMTbQTlxAEmeleZXmJuN81UfnkJAdKdG5sivLiQRWwCDG0faBnoMw=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.14"; hash = "sha512-KfRzkAToFV4pgZuiLVXlyw4RbuGYsSAiAvZZQOno6Bv//zX1zTyJJiVcxlJ9fh92cDS8uJz+PaJ/ejhOHs5oWw=="; }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; + version = "9.0.14"; + hash = "sha512-HwEHZLrgvrqc9GIQjcgg82bXj/m/czjG83IXMvg4y8qRsazVzJRwXn4f6pvR8Go4PTHADHN2odZ1RA7oR+o6QA=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; + version = "9.0.14"; + hash = "sha512-gOGZh9SXiPP30Hq3jNNy6XyRHGy+imGddd+vITJiP0OO4B43YgBIzcaPytEzM3YPNeB9DHHZxgKenouAybqogQ=="; + }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.14"; @@ -62,49 +45,38 @@ let version = "9.0.14"; hash = "sha512-hIhDoJ1Je7kTlBjVaQEa8Ea2v9YNzHFpjTgHTuuE+uXw85mMA30+FU04rHd6ItX7i5oEYR2qfBSe2IvLtvsrZw=="; }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; + version = "9.0.14"; + hash = "sha512-gR+yvtmxVFmAlwoFJ4wCyg991R3yLBacoOyIH+XnZYJdXy/L7a413nVGoqNpre09YT9MDlj8AVhp06elEI4ifA=="; + }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; + version = "9.0.14"; + hash = "sha512-llH6vLel6SlPJuM7ujDqY9ZsPfkXglVlF1EozKPTdzVarxzfy3xbFnFxoUH0Ubl4KYIC7F22+SFA0gIX4lT7Qg=="; + }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.14"; hash = "sha512-cgIB1paNuwG20tY2h30OJrWH3f2XMGUTf3PH5qUEbM8Pnx/trvofuRhzCcmdiIMCw7uG0Z8fGusOslH2a2u++g=="; }) ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "9.0.14"; - hash = "sha512-k1438qjynTL1eptYrRrmrg1jA2fjz9r0Bk+ltiex9kyEh6+cBbKxn2LaCCsf//Q6WU1sgEBAgJfnrK0hVQ0RIw=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "9.0.14"; - hash = "sha512-jQy+3YpdZKdohZnPleV0sBUTagxF3R2JE4zxwbw0H9RjiRCIWJA73NliPGXtLZUp/wBRQ/uyb3f6exCgNbebdw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.14"; - hash = "sha512-dWm61FQAslco/9j9JsuwHVL73Id80BPdZbnj3eQCanrML6VfkpLN6qFUZjHVnY8sK32oPO5vXKXI5l6iyfc+Vw=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "9.0.14"; - hash = "sha512-NpmKObqpu0rbcsinVsQ/+ljJLdshU0itfaLwvOXd6T/Elv+YiaVQQJs9zauEqjXPQzJ4/fQsPje7WwDOUspR4w=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.14"; - hash = "sha512-/uABIz7gXDWtRK1w8GLw6BOcMCb7nxjtxiFiTgnEQZuR/rSe9GIfZtYx02xEYPmd50C2IKdijxr3Xl9RU2h5fQ=="; - }) - ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.14"; hash = "sha512-tl/iXIYlI4kpxftKdZkMzfS0iaXoFS3rZaLjf6n+nhOUPBR3iHfciHRCgClIFBIDkz03PMmSQYgJgfEmb1CIWw=="; }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; + version = "9.0.14"; + hash = "sha512-l9EKeutIuK8ZYHfRLO4JNTgsCv9zwD7bNU27rkfkG00PJWzoIVutTGMLYf1OiYCKVJtawXQcfSgC74cYDDrPnQ=="; + }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; + version = "9.0.14"; + hash = "sha512-lkKYv2JhU5a6Ywil9qz2JBBBj8Qt8svswGIe0NG7BVi86vInbJAJWJZHBiwvG+3YmonYhbkEIPQ+xFWdONh8GA=="; + }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.14"; @@ -117,89 +89,36 @@ let version = "9.0.14"; hash = "sha512-BS0EiLj7JtUJ7i9r63LNSqMIQwVbgvCbVgNDkA3vvhy97/BP1zS0R1hcF3AVZTEiF6TRpk/MRJmsNoYwS7bdZw=="; }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; + version = "9.0.14"; + hash = "sha512-BXoutYs8qFdBSjtaRqrauyJZqS2CLI1NVuxtchwdg9aQxX9xG4Hc4POIqvFrZaRoVrcpxtGCSEbg6vvDWCJBrA=="; + }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; + version = "9.0.14"; + hash = "sha512-KVeVExPnYZITgzP6Au2IaxTOES6vhIvhPOPPa7Z6DwsSu6Zd6t03HxM6JyU5/D2nKofjBnvcPjKW+zS6gA5zCg=="; + }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.14"; hash = "sha512-ltQrtUR4/z8hmlSSkV2dU0rBHmAIWNmKmpetNqTJY233SeVjbgieza3EAS8tYMhJHXAGaqjk84Em8qPaemefDA=="; }) ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "9.0.14"; - hash = "sha512-glpxsqvwHefKH1cnUUshgCoFDS7xRFjm+O4V+16GncKB/ONcEZIGm8WwnEaRCdqu/Uggsd87x5CJYXI3wIZ4sg=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.14"; - hash = "sha512-GVBMo1f82CZW/XjV1zird6w02rfV8qlu/DZtu8IP0nJ+A7744K7Fi6RJNXKJE+C+tqMmlTkylF/mnaxn4UjpSQ=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "9.0.14"; - hash = "sha512-SePD8uQ7n7Q81G2Psvlo8hPbqkFVYhCvILO8mFSvpqOgY7OiiqQj1sBPZKkNhcVU4CZ7LUUOLH7Wv+4gcobK5A=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.14"; - hash = "sha512-5jDtZ0QMVbLvdAvnQy3hrkyBC6SCt1Z2o14cesEiamxpeB/gpgPmAqpqcuWMQFyXoqfWENUm3dAPpTeW2pAQ5w=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "9.0.14"; - hash = "sha512-6VrIMox8q/tUnQHciEhvOj9l8NfWq8NnYfGle7IUYkZnM21fOqcrmF0jgLWXl48QI/xRVVDMlqg+TWT42jdigA=="; - }) - ]; }; targetPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "9.0.14"; - hash = "sha512-hLN+9dSfcJyNarm8hCHI1R+hDYeufiIGRrr9DfsGN/qrPDyS7awpShEwIdsZ+ChMfdxoYDgnrCV/1PClwqOwWw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "9.0.14"; - hash = "sha512-q8AJOVKXCvstKVv/Pdg37mPBf61bFO1u0RoMjksz18LnlQ4xbgzLG5kSILieUg0O95H/rUJ1+rb6dX17fDduaQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "9.0.14"; - hash = "sha512-YJaprNxzr6eTrV+zcIZzi9f3wFrjF2KSwG3XvCm5+4vSZ1JFLW8XFQKY/DqIk0UAoEX92W8TJ7ygBXB5FQMh9w=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-/bdvIYq3+gSIILJ4R2wdqy4MXC/ZvgbHjQ7jq5fBjUGMiobjsxgab1WRo49Pjc4mGJPLwoggygxgAj5j442mkQ=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.14"; hash = "sha512-vKjaQVMP39vBz3CkOpJILVyz+ActsFe0yEvmDOa1EXdR6aCUkpfq89icnlSFWr/oicz9hxGK/cOQgSnRXM2T8Q=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "9.0.14"; - hash = "sha512-GxHFKrzlQ57mYMPXJiZxboJ/rSEecvQgmfvdg7fAnD7c8/JE0AdohboYeCebQEPAOV2R0wEf3LoACUqS3/2y7Q=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.14"; hash = "sha512-AmLrJ5tBEwPK1VMPdk4Vy3Z6++yGkaL5bpKwGpY9SUL8x6nwQjWfY87snOK99X8NEXltxJNovP0FkRLCi+Zr2g=="; }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-jHaj6hgSuJ8d4jPFSWyrbyQROhTgMqCFKb+RcNpRf1EJ/0kHbu1vn73qxURYjiol+9jaEjKanJDqZwh76x/tFw=="; - }) ]; linux-x64 = [ (fetchNupkg { @@ -207,87 +126,11 @@ let version = "9.0.14"; hash = "sha512-jYd+5KNUzdo36ytc1Lz4TlAeHhRNMXQr3cdBzYAqCx9wfsOUnqPM24nx7XNvNryawyjPicbdP2wiNBgdQlts7A=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "9.0.14"; - hash = "sha512-++Z4DoiGwsqVoGM3YvXsWoEzLVXSXQvTnIKUfCV/GIa7crEgG34Tb/yYzyJvdFScqrHbgf1gYyYeE67iBhlgDw=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.14"; hash = "sha512-f7N/o6P9rxLrfKJyyy7pp/7ytpe+CNa9LdyWPjYBSTiVi9bIPq1yXK6MM4PewCkLsoS0jOOEWmfYHrYb5Fw7VA=="; }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-14RbsWvcKBwytrmEpdFvKhFLif6UDfEjlFsZJ7BGREPDNGXg197CkcJHCvn8nVY5jnEju3zCmlSSgPufgd3U0Q=="; - }) - ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "9.0.14"; - hash = "sha512-RD/mlV6K5OupTnGDEP5KIFCsqsPaPJnxZh3SEowf/ShRL3djfZqz/a3WJVrpyjt7jpiOlRf+3HPl3pGmqZoOqw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "9.0.14"; - hash = "sha512-SNuZTEbjDCUasMXqoRCOPR6zkIeaORIj2FZkvUY72M8D9U+hxOjDhf3DltesRmtOFuhDkgB5KNCL6zriAvbung=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "9.0.14"; - hash = "sha512-7tlCJe1E7aFUXY53OFjLD+LAsblMfMDBDhLXLx3QdYA9IRKopXQrCtAvFQ+i+i56mKs9RVUmg2v+RjxXwP/MUg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-/UEQYhm/+Zo2ulnZiEzP18vqcPWgqnFmlobEvZc9TCVGx205H8XoDsZ5+MU156Vbu2G6K8El2UCJeE8X9qXRbA=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "9.0.14"; - hash = "sha512-YWI8RNne2riYIn7tn8+5ewJFIzeskhJ3MfiZEHh17lmixvwPczfW+uqRdHAZ0ERYWpYFO+rO3/4/66WuU4H96Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "9.0.14"; - hash = "sha512-Ft8hxap4jV64vvOdcomyEJ2b1HFmXE2D1d8Ib0iNcbf/0qyYxosNQQa+Ttzq0AoODWmq6cHdWjPAfYgMQPOM8g=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "9.0.14"; - hash = "sha512-oF4pLSWyrR96tyVignbQ12gR+6JcozCv1BO9mBy4j70EDsV7vpm3x3PGoA+SaXaDDm+SGddFElx+MOUzB8jEsg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-ReEgJh8mRp1wRzHjkbIZVcLZyBj7K9KZzYjHhzOCS6gFEF/V/4fesp8MVlzLdXSBV+ZunSUwL5hWWvUlx+nQ9w=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "9.0.14"; - hash = "sha512-jSo6p8k62QbPGfCFxRJEnjTJz2HKEV3YP9SXYyTRXnUrXypLzHqU0GUQmgzMGZBM+MTHUEsH6Bhy+r7j1QpICA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "9.0.14"; - hash = "sha512-H3zVn1SRcQ/anQpfg44zFVsAtkdj8YAdrNVU+dxe/2fB/ZBjVDZaMoTT/d0fd7wyzDxufPE2IVXK7JyeExsrfw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "9.0.14"; - hash = "sha512-nk3joXKiqVG0ryUg8FqCAlfl1hSqCL5gbTFaIe+vC1eVheitArOaxY4TU+tCsG/XNoskLaAG7ptU1eXMpesung=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-UIwm0mfT7u9HLdfVi6uPBt9gplnCCbncc6XNOhYJfEB441j2kDRkKDSVhfXerA2lCut0U4fQQm+i9qGd6dFlKg=="; - }) ]; osx-arm64 = [ (fetchNupkg { @@ -295,21 +138,11 @@ let version = "9.0.14"; hash = "sha512-Nxre0GsAxbGLmlfymqMYsWps0rexVTEyKyCtv4SZs+OnRd16xd3YFoxuqwaqKOSGuDPRIX9yJF/POjWnanA0HQ=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "9.0.14"; - hash = "sha512-S1jr/9rRWM2bUoz7AHALT5frHBnAiHWEb5WhrKuRzJogN1bCDOpGXnkZ0zEHbNIbhTeZbkmMLTkch/ZDBvm8qQ=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.14"; hash = "sha512-1j/Sem8h5XELOfV/8mnVdXuYcltI0JXAyvzNeC7uBJlH/ic1HZ00TQlWsv0/WIgnHgSTAgNaa1HxnAYL35NITQ=="; }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-8mOcQRKCm9QisJOZ8GJTV+Z0pStXlnvCAQnmfYFF408Vo9c08bnla0sHRHobFVRxtWqMojvHGHwnUlnp9XrPLw=="; - }) ]; osx-x64 = [ (fetchNupkg { @@ -317,87 +150,11 @@ let version = "9.0.14"; hash = "sha512-DPYynWbPeB1oLDtUxOQLu5SzJQlqQzG01mxGoD1qTjDK1V1a1eVWfKMRZ56tKkIS40zywn8ku7Rpmrf4F4v1CA=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "9.0.14"; - hash = "sha512-3hDLHUaEXPG1j03/fk1vpJZMRQn1TFh3X5yGdFLM2d30R2jcKf0IQruN1x4r9QtOOA2d3WpQJ01pYCd/GK65OA=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.14"; hash = "sha512-2mjykmXgsvwZb6qItFVw5uTNlGE30SdjSbTaDzwElYIo0ZFJHKYMuQsBxJD1GUzets0n+g0Z/dZ+MjddeYI5Vg=="; }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-fyAsLUnRPvTSnzOax4IQHoSdsrBbAYZ5OtMdulCA1prKJ82ZG80stokdB3vkvLyGqGCg6h7R4VhsZrZRuFKP7A=="; - }) - ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "9.0.14"; - hash = "sha512-fXXqGF24E+d6zQ4JoiTfnlb84ER/G2RsHJRiv5DbljthIGAv5qxnwT4B5C2EdpOvipovF6i8D2z9oDwNwThR4Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "9.0.14"; - hash = "sha512-wXiDzelOZOfYgAgHaYNyXq9yFEH9H9JtMIBMAt1XLe7aB9t8ikOi6ki8vW1/xCVyTChQD+gRvFyZ5ndCl3h7Dw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "9.0.14"; - hash = "sha512-X8m5Y7a4RUtBzFkijWHGkKf9RI8ryfPaVKG7U8L6EJQhhlcaPkrR40tsA3kLWu0BrrsSLwYA+QamwZjrubAB9w=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-HQXY+yGY+9+Rkmj3g2DwVKQDzhMWANYVsxUD1btokmnQPmznWt8NWwF6pFkCcgFocbzUYTTlmxfKb+LVI928Uw=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "9.0.14"; - hash = "sha512-ACy6Ms3VSZ8yGl8sPOheIzmJf/T4HtkW1ZhYMiYgbA3dAIonrDPvk0SACANEwmLAHUoPSRkZ4xEqDrg0EptzMw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "9.0.14"; - hash = "sha512-YLy95lsjZts5RPMNk+ahD5LKmKpKMNvtXOqHNdz9DfjG3YEBwzIffGVVs51NkWf93ivLPGcBcn/VAzuW47I3UA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "9.0.14"; - hash = "sha512-xuo9nZxqdcbn+Q4laeN3a3RXr6fPE49EzLU8uNj506udjEKL58J9IpbKMX3DU9zE7Wp1p7/AY68UkHqOlVtKOg=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-LmujYamAcv6GHlRs4xhnRWUKMfW4n9gI1t3w9mVapHfWZ9ErbgvjEJyXNTp4qmB6xIR00ggXLSQGfRuiZV/KqA=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "9.0.14"; - hash = "sha512-cH6M0YAJOZOl/Nb1lllWqewvsgBZQ8x+ix7QImG5WFvx4nSuUDINRigq8zZeUL1Q05GTsC6U5CVWhY1HrhFdOw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "9.0.14"; - hash = "sha512-ZYOr/UXKLXLdhsVAvRKZu9mVGdFw7282EBgwvBIUZR8zzVxd4qseapdw9Fhoop1stOtVcgs1RGqnHJdRx5O1UQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "9.0.14"; - hash = "sha512-7Wdn3dL26+J/Gbl4hM4uHARyTcLCv8ugk/gQ18hP6JvUXHkqZZzsOr0bVqTXU8+2/Py+shyIkJM7nqANTCaI1Q=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-w4B7gwQCiSW+m8ioNz6oYEv8ZD65PuZfPN5nJPegjQeJQJcpPjl8LS5qS4zIIF99tDzL9HdbTd2/ctUwRrVJyg=="; - }) ]; }; @@ -408,10 +165,6 @@ rec { aspnetcore_9_0 = buildAspNetCore { version = "9.0.14"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-arm.tar.gz"; - hash = "sha512-TBC0tyYmkKui6pajHM8MzIRUxlR/BmNwqm7pJjPADoUFw8DOjdh8HFepegYDJ/NMf0QlqFZ+4gEjqbrESbFQYw=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-arm64.tar.gz"; hash = "sha512-xc0FlxycugwhHOtV4ibL+2LxctuDRfpdTkdqTMs6T2HW5R3CstF461XzZzrS1hz3KuZJ+4TM8sPbu9Ss27eBMg=="; @@ -420,18 +173,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-x64.tar.gz"; hash = "sha512-bQlHOQ+ewxYpfyGp7AIlKKJyBaRDKPlBf7hnV4PtxWAi5eFeplZQxec8tzkXwJxSMF0+heTBKs1eEQdIcbsGeQ=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-musl-arm.tar.gz"; - hash = "sha512-zrzx18hUhb1dNIbwRjCB9BN1llCaDnhh4xp7XsNqkMex3nLPKJXojRdIZkC7dZPbK3EQhYo3cbbSM5hlyHwSjQ=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-musl-arm64.tar.gz"; - hash = "sha512-2tBpSpdV081M9ea/4wjqqLkEYTkYTIVzhyKwNuiPF4+NY/mv7RLiZPLEHRPmsYoXr90d77l62IdaIrtILcFhMw=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-musl-x64.tar.gz"; - hash = "sha512-gfkhRH1kcJoln+AIOLN7vUoor9ZZOMqgcYvr/GDrwKohsDHwSQ9KFqrI/6T9rvaBAbK/DX17mSKT1g+3NXqHfQ=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-osx-arm64.tar.gz"; hash = "sha512-VhV7qrlOtSivrPkhaX1mPrID4RS+mOCKAxUwPQm4+F9y8dGT7tpx5Mg/Tl38hRffUoq4ZJ0XVIt7YTaruvfr/w=="; @@ -446,10 +187,6 @@ rec { runtime_9_0 = buildNetRuntime { version = "9.0.14"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-arm.tar.gz"; - hash = "sha512-K3U+B6gtlvZGzWhpuejfpdmCEElRqEBTcu2RpBo1lqts7bHmnDUjhApXN+qRtuMVzTQSSF+B9wjdtLgul43aTw=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-arm64.tar.gz"; hash = "sha512-D+DekyKzozyyMlbOZJ/lqUlNtUdsUO8lM4bXTp43Ipk87jh9aFAGETGti3fxRUj6E/dyyUhsMq6jzQjjE/dvcg=="; @@ -458,18 +195,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-x64.tar.gz"; hash = "sha512-2w2wuecJ/+Rj3q2U+053ubDHCGu6p4p4qmtTZr73e6PDOJmoHDwa7zwRAnoebN6/SnrTBTK9wZPw3sxxly5d2g=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-musl-arm.tar.gz"; - hash = "sha512-5l8d7bW/Se74Ky0rCE5BPPrNL6VK2QJdGVRo6TNpiDRfjJROxQ2oVTp3vG+fK4S4yPMEGy9pshpAVC9LOn8BsA=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-musl-arm64.tar.gz"; - hash = "sha512-bm7BOWvjDk04/CYgOk7fWotjEHYm6/C+CkFK3hmwuKbJQm7QHPMZiXlogcr4ETjnmtLzR4+Hd1tomVpN120Whg=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-musl-x64.tar.gz"; - hash = "sha512-1tW85BslqLqSgjEI0/k8UajaJffCL+ZcEh4Z7wky2Jc/iMhjvfItHs8ExJjcanI8ZT3jAHeZP2SGWbw5HzkA4g=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-osx-arm64.tar.gz"; hash = "sha512-I+bbmZG+jlrTsGD0/oKGAXa/Qx+zSR2f1lZyWTvQBLqshg1JuoOozYRHZqcUGwcMj6jQyKXQ+mi5uNFTsKk72g=="; @@ -484,10 +209,6 @@ rec { sdk_9_0_1xx = buildNetSdk { version = "9.0.115"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-arm.tar.gz"; - hash = "sha512-cAanOGAWneLKPb7IlfGYYlxHLDxKEueHqUyGVFei4vLIWh3Mog7nwl/j1xa/tIdri7E7LN0nv/g8QH4dDsOZOA=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-arm64.tar.gz"; hash = "sha512-zJhNLUXOnu0k3Xih2SG0GbgRMZJ66RC6UL0oCfZMxADGUlJAJwUyopA6VPWQjEWAmGTMNUZVqLpEUBcmN9z+cg=="; @@ -496,18 +217,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-x64.tar.gz"; hash = "sha512-g38je4D8WM3Jf4AVTHz+UFpzKNyTxUFAZwdhBVq1bUHaEfhiDlAKpAVXhqfuCxOLW3Nga0vOThLIYBukJtOtgw=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-musl-arm.tar.gz"; - hash = "sha512-OwDO/OCWK744lXcdNyem2R8gjm+IGfBeZxqkB9e0zslYUGSwHy3ujWJn2IaAhMZ5uIT5Jt19SqDBXwXX+bQt4w=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-musl-arm64.tar.gz"; - hash = "sha512-A+DrkfpbPaqlCVp9RBbFGNwyPM5cQs8xaxsJT9s7gZfhjhr3XUzNUR3k66gEqjs5nUEEaAb8sep5BSPCj8BrGQ=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-musl-x64.tar.gz"; - hash = "sha512-DtLBHH7hyOmtRPXSgF50jwCU2jGHNi0KDKNCqnWvz9W8Gf5yOSPtvdC09nKtxFXBj8jwgaVBWZ3xbbiFXj45Jg=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-osx-arm64.tar.gz"; hash = "sha512-eU+QDeVY8w8uI3WWXAjADdSZCq0p4xv9CTsIsdmlv1fHjMbz22jNhTB2+BaJKJjEPVCOeES0BguKkR3Om8x3Xg=="; diff --git a/pkgs/development/compilers/dotnet/9.0/deps.json b/pkgs/development/compilers/dotnet/9.0/deps.json index 33c0ba6dc780..fe51488c7066 100644 --- a/pkgs/development/compilers/dotnet/9.0/deps.json +++ b/pkgs/development/compilers/dotnet/9.0/deps.json @@ -1,50 +1 @@ -[ - { - "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", - "sha256": "35e10f23c0b5b10901551c68d1abe981a0b48c8e4b86c61c3a1985458f5a81f6", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.14/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "9e721aed2a8597685c251c479bdf1838c9c014b4fa2ec26ef4e162747f97e12a", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.14/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "hash": "sha256-nfXhbwSIvFUxNs5+NV92pYj5xpge9N5ydUy8kZ5xZ6Y=", - "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.14/runtime.linux-x64.microsoft.netcore.ilasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "hash": "sha256-C/UpFPa+dNKLBn4YPCRQhyrIj4CXxL6mIjIR/vnTs3I=", - "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.14/runtime.linux-x64.microsoft.netcore.ildasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", - "sha256": "5934e0320090375e08c8bf93eac462bd06bf779b179a336eb679bf4acd5b9f6a", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.14/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "06409aff89f46a10122437e87c8a7adc1be66ab83f9544e9b3f53736c015e48f", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.14/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", - "sha256": "ba94d34897841a2fea3f64c6b6a5dc61c757c9ca08912fbd3d300e09b9a6c2f0", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.14/runtime.osx-x64.microsoft.netcore.ilasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", - "sha256": "4564854526fa0e2ccb5a460c9e82beb6d4dad7ea003504cee4f4073bda350809", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.14/runtime.osx-x64.microsoft.netcore.ildasm.9.0.14.nupkg", - "version": "9.0.14" - } -] +[] diff --git a/pkgs/development/compilers/dotnet/binary/update.sh b/pkgs/development/compilers/dotnet/binary/update.sh index 63ad985e965f..b1320ac545e8 100755 --- a/pkgs/development/compilers/dotnet/binary/update.sh +++ b/pkgs/development/compilers/dotnet/binary/update.sh @@ -7,7 +7,7 @@ shopt -s inherit_errexit trap 'exit 1' ERR -rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) +rids=() release () { local content="$1" @@ -124,22 +124,25 @@ versionAtLeast () { # with every new major .NET release. aspnetcore_packages () { local version=$1 - local pkgs=( - Microsoft.AspNetCore.App.Ref - ) + local pkgs=() - if versionAtLeast "$version" 10; then - pkgs+=( - Microsoft.AspNetCore.App.Internal.Assets - ) + if [[ -z "$vmr_bootstrap" ]]; then + pkgs+=( + Microsoft.AspNetCore.App.Ref + ) + + if versionAtLeast "$version" 10; then + pkgs+=( + Microsoft.AspNetCore.App.Internal.Assets + ) + fi fi generate_package_list "$version" ' ' "${pkgs[@]}" } aspnetcore_target_packages () { - local version=$1 - local rid=$2 + local version=$1 rid=$2 local pkgs=( "Microsoft.AspNetCore.App.Runtime.$rid" ) @@ -149,23 +152,27 @@ aspnetcore_target_packages () { netcore_packages () { local version=$1 - local pkgs=( - Microsoft.NETCore.DotNetAppHost - Microsoft.NETCore.App.Ref - ) + local pkgs=() - if ! versionAtLeast "$version" 9; then + if [[ -z "$vmr_bootstrap" ]]; then pkgs+=( - Microsoft.NETCore.DotNetHost - Microsoft.NETCore.DotNetHostPolicy - Microsoft.NETCore.DotNetHostResolver + Microsoft.NETCore.DotNetAppHost + Microsoft.NETCore.App.Ref ) - fi - if versionAtLeast "$version" 7; then - pkgs+=( - Microsoft.DotNet.ILCompiler - ) + if ! versionAtLeast "$version" 9; then + pkgs+=( + Microsoft.NETCore.DotNetHost + Microsoft.NETCore.DotNetHostPolicy + Microsoft.NETCore.DotNetHostResolver + ) + fi + + if versionAtLeast "$version" 7; then + pkgs+=( + Microsoft.DotNet.ILCompiler + ) + fi fi if versionAtLeast "$version" 8; then @@ -178,65 +185,81 @@ netcore_packages () { } netcore_host_packages () { - local version=$1 - local rid=$2 + local version=$1 rid=$2 local pkgs=( "Microsoft.NETCore.App.Crossgen2.$rid" ) - local min_ilcompiler= - case "$rid" in - linux-musl-arm) ;; - linux-arm) ;; - win-x86) ;; - osx-arm64) min_ilcompiler=8 ;; - *) min_ilcompiler=7 ;; - esac + if [[ -n "$vmr_bootstrap" ]]; then + if versionAtLeast "$version" 9; then + pkgs+=( + "runtime.$rid.Microsoft.NETCore.ILAsm" + "runtime.$rid.Microsoft.NETCore.ILDAsm" + "runtime.$rid.Microsoft.DotNet.ILCompiler" + ) + fi + else + local min_ilcompiler= + case "$rid" in + linux-musl-arm) ;; + linux-arm) ;; + win-x86) ;; + osx-arm64) min_ilcompiler=8 ;; + *) min_ilcompiler=7 ;; + esac - if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then - pkgs+=( - "runtime.$rid.Microsoft.DotNet.ILCompiler" - ) + if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then + pkgs+=( + "runtime.$rid.Microsoft.DotNet.ILCompiler" + ) + fi fi generate_package_list "$version" ' ' "${pkgs[@]}" } netcore_target_packages () { - local version=$1 - local rid=$2 - local pkgs=( - "Microsoft.NETCore.App.Host.$rid" - "Microsoft.NETCore.App.Runtime.$rid" - "runtime.$rid.Microsoft.NETCore.DotNetAppHost" - ) + local version=$1 rid=$2 + local pkgs=() - if ! versionAtLeast "$version" 9; then + if [[ -n "$vmr_bootstrap" ]]; then pkgs+=( - "runtime.$rid.Microsoft.NETCore.DotNetHost" - "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" - "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" + "Microsoft.NETCore.App.Runtime.$rid" + ) + else + pkgs+=( + "Microsoft.NETCore.App.Host.$rid" + "Microsoft.NETCore.App.Runtime.$rid" + "runtime.$rid.Microsoft.NETCore.DotNetAppHost" ) - case "$rid" in - linux-musl-arm*) ;; - win-arm64) ;; - *) pkgs+=( - "Microsoft.NETCore.App.Runtime.Mono.$rid" - ) ;; - esac - fi - if versionAtLeast "$version" 10; then - pkgs+=( - "Microsoft.NETCore.App.Runtime.NativeAOT.$rid" - ) + if ! versionAtLeast "$version" 9; then + pkgs+=( + "runtime.$rid.Microsoft.NETCore.DotNetHost" + "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" + "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" + ) + case "$rid" in + linux-musl-arm*) ;; + win-arm64) ;; + *) pkgs+=( + "Microsoft.NETCore.App.Runtime.Mono.$rid" + ) ;; + esac + fi + + if versionAtLeast "$version" 10; then + pkgs+=( + "Microsoft.NETCore.App.Runtime.NativeAOT.$rid" + ) + fi fi generate_package_list "$version" ' ' "${pkgs[@]}" } usage () { - echo "Usage: $pname [[--sdk] [-o output] sem-version] ... + echo "Usage: $pname [[--vmr-bootstrap] [--sdk] [-o output] sem-version] ... Get updated dotnet src (platform - url & sha512) expressions for specified versions Exit codes: @@ -251,8 +274,7 @@ Examples: } update() { - local -r sem_version=$1 sdk=$2 - local output=$3 + local -r sem_version=$1 local patch_specified=false # Check if a patch was specified as an argument. @@ -274,7 +296,7 @@ update() { local major_minor content major_minor_patch major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) - if [[ -n $sdk ]]; then + if [[ -n $sdk_only ]]; then trap '' ERR major_minor_patch=$( jq -er --arg version "$sem_version" ' @@ -294,7 +316,7 @@ update() { aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content") runtime_version=$(jq -er '.runtime.version' <<< "$release_content") - if [[ -n $sdk ]]; then + if [[ -n $sdk_only ]]; then sdk_versions=("$sem_version") else mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn) @@ -320,6 +342,12 @@ update() { fi fi + if [[ -n "$vmr_bootstrap" ]]; then + rids=({linux-{arm64,x64},osx-{arm64,x64}}) + else + rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) + fi + local aspnetcore_files runtime_files aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" runtime_files="$(release_files "$release_content" .runtime)" @@ -401,7 +429,7 @@ in rec { };" done - if [[ -n $sdk ]]; then + if [[ -n $sdk_only ]]; then echo " sdk = sdk_$major_minor_underscore; " @@ -419,17 +447,22 @@ in rec { } main () { - local pname sdk output + local pname pname=$(basename "$0") - sdk= + vmr_bootstrap= + sdk_only= output= while [ $# -gt 0 ]; do case $1 in + --vmr-bootstrap) + shift + vmr_bootstrap=1 + ;; --sdk) shift - sdk=1 + sdk_only=1 ;; -o) shift @@ -437,7 +470,8 @@ main () { shift ;; *) - update "$1" "$sdk" "$output" + update "$1" + output= shift ;; esac diff --git a/pkgs/development/compilers/dotnet/source/stage0.nix b/pkgs/development/compilers/dotnet/source/stage0.nix index ef08f24a024b..58af9501a8b7 100644 --- a/pkgs/development/compilers/dotnet/source/stage0.nix +++ b/pkgs/development/compilers/dotnet/source/stage0.nix @@ -66,9 +66,12 @@ let ''; postConfigure = old.postConfigure or "" + '' - [[ ! -v prebuiltPackages ]] || \ - ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ - ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ( + shopt -s nullglob + [[ ! -v prebuiltPackages ]] || \ + ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ) ''; buildFlags = diff --git a/pkgs/development/compilers/dotnet/source/update.sh b/pkgs/development/compilers/dotnet/source/update.sh index 585f45e71f19..ea4095221f09 100755 --- a/pkgs/development/compilers/dotnet/source/update.sh +++ b/pkgs/development/compilers/dotnet/source/update.sh @@ -95,12 +95,17 @@ EOF ) fi - tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh - artifactsVersion=$(xq -r '.Project.PropertyGroup | - map(select(.PrivateSourceBuiltArtifactsVersion)) - | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) + getProperty() { + xq -er ".Project.PropertyGroup | add | .$1" "$2" + } - if [[ "$artifactsVersion" != "" ]]; then + tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh + set +e + artifactsVersion=$(getProperty PrivateSourceBuiltArtifactsVersion eng/Versions.props) + rc=$? + set -e + + if [[ $rc == 0 ]]; then artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh) eval "$artifactVar" @@ -120,11 +125,11 @@ EOF [[ $? == 22 ]] artifactsUrl=https://ci.dot.net/public/source-build/$artifactsFile } - else - artifactsUrl=$(xq -r '.Project.PropertyGroup | - map(select(.PrivateSourceBuiltArtifactsUrl)) - | .[] | .PrivateSourceBuiltArtifactsUrl' eng/Versions.props) + elif [[ $rc == 1 ]]; then + artifactsUrl=$(getProperty PrivateSourceBuiltArtifactsUrl eng/Versions.props) artifactsUrl="${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}" + else + exit $rc fi artifactsHash=$(nix-prefetch-url "$artifactsUrl") @@ -150,7 +155,7 @@ EOF if [[ $band == 1xx ]]; then getBootstrap() { pkgs/development/compilers/dotnet/binary/update.sh \ - -o "$output"/bootstrap-sdk.nix --sdk "$1" >&2 + -o "$output"/bootstrap-sdk.nix --vmr-bootstrap --sdk "$1" >&2 } getBootstrap "$sdkVersion" || if [[ $? == 2 ]]; then From b03c6ea7c0645184ba8dc5b3ee80752a27e029f7 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 8 May 2026 15:14:18 -0300 Subject: [PATCH 22/59] dotnet: build only source-build-reference-packages in fetch-deps This is all that's needed in practice to populate deps.json, and it's much faster. --- .../compilers/dotnet/source/stage0.nix | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dotnet/source/stage0.nix b/pkgs/development/compilers/dotnet/source/stage0.nix index 58af9501a8b7..76cc50f977e9 100644 --- a/pkgs/development/compilers/dotnet/source/stage0.nix +++ b/pkgs/development/compilers/dotnet/source/stage0.nix @@ -135,8 +135,35 @@ let -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1901' \ src/$proj/Directory.Build.props done + + # disable all the after-build targets + substituteInPlace build.proj \ + --replace-fail 'AfterTargets="Build"' "" \ + --replace-quiet '$(RepoProjectsDir)dotnet.proj' '$(RepoProjectsDir)$(RootRepo).proj' + + [[ ! -e eng/finish-source-only.proj ]] || + substituteInPlace eng/finish-source-only.proj \ + --replace-quiet 'AfterTargets="Build"' "" \ + --replace-quiet 'BeforeTargets="Build"' "" + + [[ ! -e eng/extract-sdk-archive.proj ]] || + substituteInPlace eng/extract-sdk-archive.proj \ + --replace-quiet 'BeforeTargets="AfterBuild"' "" \ + --replace-quiet 'BeforeTargets="Build"' "" + + [[ ! -e eng/PublishSourceBuild.props ]] || + substituteInPlace eng/PublishSourceBuild.props \ + --replace-fail 'AfterTargets="Publish"' "" \ + --replace-fail 'AfterTargets="DiscoverArtifacts"' "" ''; - buildFlags = [ "--online" ] ++ old.buildFlags; + buildFlags = [ + "--online" + ] + ++ old.buildFlags + ++ [ + "-p:RootRepo=source-build-reference-packages" + "-p:SkipPrepareSdkArchive=true" + ]; prebuiltPackages = null; }); From 722ad843a4ca5a3bdb8ec86d0a172c150acc9655 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 20:26:00 +0700 Subject: [PATCH 23/59] python3Packages.mdtraj: disable more network tests --- pkgs/development/python-modules/mdtraj/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index d4632b852af6..16cbb0e1fb2c 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -84,8 +84,10 @@ buildPythonPackage rec { disabledTests = [ # require network access - "test_pdb_from_url" + "test_load_pdb_from_url" + "test_load_from_url" "test_1vii_url_and_gz" + "test_1vii_load_from_mixture" "test_3" # fail due to data race From 6bc8ce5861d5f6d9e6df24bc44da24076f82573f Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 10 May 2026 23:05:41 -0600 Subject: [PATCH 24/59] balatro-mod-manager: fix build on aarch64-linux --- pkgs/by-name/ba/balatro-mod-manager/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/balatro-mod-manager/package.nix b/pkgs/by-name/ba/balatro-mod-manager/package.nix index 835a888d20e0..b23eb1e72286 100644 --- a/pkgs/by-name/ba/balatro-mod-manager/package.nix +++ b/pkgs/by-name/ba/balatro-mod-manager/package.nix @@ -50,7 +50,12 @@ rustPlatform.buildRustPackage (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-97O4DrnjZO2mhSrCQz9xbcRCSaxMNNa4NaLNPlmecJg="; + outputHash = + { + x86_64-linux = "sha256-97O4DrnjZO2mhSrCQz9xbcRCSaxMNNa4NaLNPlmecJg="; + aarch64-linux = "sha256-0H14Be8jhBwOBG2Ui8gYrnAcTtatLVsBxFVfTyzmutw="; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}"); }; cargoHash = "sha256-TPZf4jtv/3mIpe6ASzPkIusQC/iPFpYN51XiiH6pkZc="; @@ -92,12 +97,10 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; meta = { - # Rollup for ARM64 is broken with Node modules - broken = stdenv.hostPlatform.isAarch64; description = "A mod manager for the game Balatro"; homepage = "https://balatro-mod-manager.dasguney.com/"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; + platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.aarch64); maintainers = with lib.maintainers; [ mhdask ]; mainProgram = "BMM"; }; From 7b7892e1b1cc56f94fb8beb88fbbe6184f63f590 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 10 May 2026 23:07:00 -0600 Subject: [PATCH 25/59] balatro-mod-manager: add ryand56 as maintainer --- pkgs/by-name/ba/balatro-mod-manager/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/balatro-mod-manager/package.nix b/pkgs/by-name/ba/balatro-mod-manager/package.nix index b23eb1e72286..6f9a59f26eb5 100644 --- a/pkgs/by-name/ba/balatro-mod-manager/package.nix +++ b/pkgs/by-name/ba/balatro-mod-manager/package.nix @@ -101,7 +101,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://balatro-mod-manager.dasguney.com/"; license = lib.licenses.gpl3Plus; platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.aarch64); - maintainers = with lib.maintainers; [ mhdask ]; + maintainers = with lib.maintainers; [ + mhdask + ryand56 + ]; mainProgram = "BMM"; }; }) From 7e152853fb14470e6df38f8d8d94990aa5ba60c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 12:37:00 +0000 Subject: [PATCH 26/59] k6: 1.7.1 -> 2.0.0 --- pkgs/by-name/k6/k6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index 7edd07e1606b..a9b1883a35cd 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "k6"; - version = "1.7.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "grafana"; repo = "k6"; rev = "v${finalAttrs.version}"; - hash = "sha256-vULff8EVWns2N7QRK/dt90Jq10W3UFGXcIe3IXqJ+yA="; + hash = "sha256-dtP2G0rk8f3TEPTf5fu/1BEH4nLzboTyE/vveVhlcqo="; }; subPackages = [ "./" ]; From f124d8254fed06b9c2e4cbc962fd478ef2a1c60d Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 11 May 2026 21:09:28 +0800 Subject: [PATCH 27/59] ayugram-desktop: fix build on darwin --- pkgs/by-name/ay/ayugram-desktop/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix index 509577e12c94..75c9951003aa 100644 --- a/pkgs/by-name/ay/ayugram-desktop/package.nix +++ b/pkgs/by-name/ay/ayugram-desktop/package.nix @@ -1,7 +1,9 @@ { lib, fetchFromGitHub, + fetchpatch2, nix-update-script, + stdenvNoCC, telegram-desktop, withWebkit ? true, }: @@ -22,6 +24,13 @@ telegram-desktop.override { fetchSubmodules = true; }; + patches = + (previousAttrs.patches or [ ]) + ++ (lib.optional stdenvNoCC.hostPlatform.isDarwin (fetchpatch2 { + url = "https://github.com/telegramdesktop/tdesktop/commit/923efd9e7ef8ff72d9b83973502e587682119e54.patch?full_index=1"; + hash = "sha256-XcmH9SSI3K2SsFjHDEMnKA6YOyWF1kRVJJAWP2/vdf8="; + })); + passthru.updateScript = nix-update-script { }; meta = previousAttrs.meta // { From 8dd105c44b18aa25594d5488b163267ccf84e736 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 13:57:28 +0000 Subject: [PATCH 28/59] telemt: 3.4.5 -> 3.4.11 --- pkgs/by-name/te/telemt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telemt/package.nix b/pkgs/by-name/te/telemt/package.nix index aa34b47931bc..df7f5210a381 100644 --- a/pkgs/by-name/te/telemt/package.nix +++ b/pkgs/by-name/te/telemt/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "telemt"; - version = "3.4.5"; + version = "3.4.11"; src = fetchFromGitHub { owner = "telemt"; repo = "telemt"; tag = version; - hash = "sha256-zOdVnW7RTPAbR6fpzDqPpwhOWjxknmg8TzGXmBCbWjg="; + hash = "sha256-jBspeSj8aRbHngK8bviVt/i1UiYUPRHSd8+7dnmJOQY="; }; - cargoHash = "sha256-/7Xd/6NEu6QqFdVUz4M+iz9+7K5lEDguyaprAKh86wo="; + cargoHash = "sha256-x5/SLSlYeGx40oXj/I/5zvyTNgSBwKsA33OwVIq9LGw="; meta = { mainProgram = "telemt"; From 61fa68485aa4668770cf7c702865a46ed573404b Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 11 May 2026 17:05:30 +0200 Subject: [PATCH 29/59] victoriametrics: 1.142.0 -> 1.143.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.143.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.142.0...v1.143.0 --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index ed8eb68050e2..0e65b7c55092 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.142.0"; + version = "1.143.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-PI4P0CGMcYbkrT8Rrgl5P56yTC+r3tnZudvFySzNJeY="; + hash = "sha256-K5NsQQ+r1XoOCfeYzZP3+2wdDpGNqWZLpe1hGqx11jA="; }; vendorHash = null; From 6feb747491b1680ab5137b9f87511eb6d3eb8736 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 10 May 2026 13:07:29 -0700 Subject: [PATCH 30/59] python3Packages.ha-garmin: init at 0.1.19 --- .../python-modules/ha-garmin/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/ha-garmin/default.nix diff --git a/pkgs/development/python-modules/ha-garmin/default.nix b/pkgs/development/python-modules/ha-garmin/default.nix new file mode 100644 index 000000000000..a445591e5dc3 --- /dev/null +++ b/pkgs/development/python-modules/ha-garmin/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + curl-cffi, + pydantic, + pytest-asyncio, + pytestCheckHook, + requests, +}: + +buildPythonPackage (finalAttrs: { + pname = "ha-garmin"; + version = "0.1.19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cyberjunky"; + repo = "ha-garmin"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vzr32vuAVafdx64Fmv257gS2a+ZbfwZNwwuF5NPQbS0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + curl-cffi + pydantic + requests + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # Upstream test relies on a field not present in the test fixture + "test_fetch_core_data_sleep_fields" + ]; + + pythonImportsCheck = [ "ha_garmin" ]; + + meta = { + description = "Python client for Garmin Connect API, designed for Home Assistant integration"; + homepage = "https://github.com/cyberjunky/ha-garmin"; + changelog = "https://github.com/cyberjunky/ha-garmin/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcd84157257b..e1cd81997033 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6897,6 +6897,8 @@ self: super: with self; { ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + ha-garmin = callPackage ../development/python-modules/ha-garmin { }; + ha-iotawattpy = callPackage ../development/python-modules/ha-iotawattpy { }; ha-mqtt-discoverable = callPackage ../development/python-modules/ha-mqtt-discoverable { }; From 1277cf4572b957e796376c62f3c77d5c2dffa423 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 10 May 2026 13:07:34 -0700 Subject: [PATCH 31/59] home-assistant-custom-components.garmin_connect: 0.2.38 -> 3.0.5 --- .../custom-components/garmin_connect/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix index cb06ea0f4ff4..76aede544d9f 100644 --- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix +++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix @@ -2,25 +2,23 @@ lib, buildHomeAssistantComponent, fetchFromGitHub, - garminconnect, - tzlocal, + ha-garmin, }: buildHomeAssistantComponent rec { owner = "cyberjunky"; domain = "garmin_connect"; - version = "0.2.38"; + version = "3.0.5"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "home-assistant-garmin_connect"; tag = version; - hash = "sha256-Df/ecgePR10LIeaGy0kmIWqiP9G7j+KscL/YA3VsARE="; + hash = "sha256-omHgfkrje5xR9gLnQpAz33+LtXm5eGJ8nERYBX4F2sY="; }; dependencies = [ - garminconnect - tzlocal + ha-garmin ]; meta = { From dfa7f5b994c72763cb533f24fc85a3d1cb2141bc Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 12 Apr 2026 12:18:12 +0200 Subject: [PATCH 32/59] pnpm: refactor derivation Signed-off-by: Sefa Eyeoglu --- pkgs/development/tools/pnpm/generic.nix | 28 ++++++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 1dbdec7c5c8b..82253bf52d46 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -8,10 +8,12 @@ installShellFiles, nodejs, testers, + buildPackages, + bashNonInteractive, + withNode ? true, version, hash, - buildPackages, }: let majorVersion = lib.versions.major version; @@ -24,19 +26,23 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://registry.npmjs.org/pnpm/-/pnpm-${finalAttrs.version}.tgz"; inherit hash; }; - # Remove binary files from src, we don't need them, and this way we make sure - # our distribution is free of binaryNativeCode - preConfigure = '' - rm -r dist/reflink.*node dist/vendor - ''; - - buildInputs = lib.optionals withNode [ nodejs ]; nativeBuildInputs = [ installShellFiles nodejs ]; + buildInputs = [ + bashNonInteractive # needed for node-gyp wrapper script + ] + ++ lib.optionals withNode [ nodejs ]; + + # Remove binary files from src, we don't need them, and this way we make sure + # our distribution is free of binaryNativeCode + postUnpack = '' + rm -r package/dist/reflink.*node package/dist/vendor + ''; + installPhase = '' runHook preInstall @@ -129,6 +135,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; }; + strictDeps = true; + __structuredAttrs = true; + + dontBuild = true; + dontConfigure = true; + meta = { description = "Fast, disk space efficient package manager for JavaScript"; homepage = "https://pnpm.io/"; From 8d092bb4671e68fb965b4471abb9409272ac6a36 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 30 Mar 2026 22:55:18 +0200 Subject: [PATCH 33/59] treewide: pin pnpm args to pnpm_10 Signed-off-by: Sefa Eyeoglu --- .../vscode/extensions/eamodio.gitlens/default.nix | 5 ++++- .../rooveterinaryinc.roo-cline/default.nix | 5 ++++- pkgs/by-name/ag/agent-browser/package.nix | 6 ++++-- pkgs/by-name/ap/apache-airflow/python-package.nix | 11 +++++++++-- pkgs/by-name/ap/apache-answer/package.nix | 7 +++++-- pkgs/by-name/au/authelia/package.nix | 6 ++++-- pkgs/by-name/au/authelia/web.nix | 4 +++- pkgs/by-name/bu/bumpp/package.nix | 6 +++++- pkgs/by-name/ch/changelogen/package.nix | 6 +++++- pkgs/by-name/cl/claude-code-router/package.nix | 6 ++++-- pkgs/by-name/co/context7-mcp/package.nix | 5 ++++- .../co/conventional-changelog-cli/package.nix | 7 +++++-- pkgs/by-name/ct/ctx7/package.nix | 6 +++++- pkgs/by-name/el/element-desktop/package.nix | 4 +++- pkgs/by-name/el/element-web-unwrapped/package.nix | 5 ++++- pkgs/by-name/fr/froide/package.nix | 10 ++++++++-- pkgs/by-name/gi/gitbutler/package.nix | 7 +++++-- pkgs/by-name/gi/gitea/package.nix | 5 ++++- pkgs/by-name/go/goaway/package.nix | 5 ++++- pkgs/by-name/he/headplane/package.nix | 1 + pkgs/by-name/ki/kilocode-cli/package.nix | 6 +++++- pkgs/by-name/mc/mcporter/package.nix | 7 +++++-- pkgs/by-name/me/memos/package.nix | 5 ++++- pkgs/by-name/mg/mgrep/package.nix | 6 +++++- pkgs/by-name/mo/moonlight/package.nix | 6 +++++- pkgs/by-name/ni/ni/package.nix | 6 +++++- pkgs/by-name/nr/nrm/package.nix | 7 +++++-- pkgs/by-name/pa/paperless-ngx/package.nix | 4 +++- pkgs/by-name/pi/picgo/package.nix | 7 +++++-- pkgs/by-name/po/postcss/package.nix | 7 +++++-- pkgs/by-name/sa/satisfactorymodmanager/package.nix | 7 +++++-- pkgs/by-name/se/session-desktop/package.nix | 4 +++- pkgs/by-name/sf/sftool-gui/package.nix | 6 +++++- pkgs/by-name/sh/shiru/package.nix | 4 +++- pkgs/by-name/sh/shoko-webui/package.nix | 6 +++++- pkgs/by-name/sh/shopify-cli/package.nix | 5 ++++- pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix | 2 +- pkgs/by-name/sk/skills/package.nix | 6 +++++- pkgs/by-name/sl/slidev-cli/package.nix | 6 +++++- pkgs/by-name/sp/sparkle/package.nix | 4 ++-- pkgs/by-name/su/sub-store-frontend/package.nix | 5 +++-- pkgs/by-name/su/sub-store/package.nix | 5 +++-- pkgs/by-name/sv/svelte-check/package.nix | 6 +++++- pkgs/by-name/sv/svelte-language-server/package.nix | 6 +++++- pkgs/by-name/ta/tabularis/package.nix | 6 +++++- pkgs/by-name/ty/typespec/package.nix | 5 ++++- pkgs/by-name/um/umami/package.nix | 5 ++++- pkgs/by-name/ve/vencord/package.nix | 7 +++++-- pkgs/by-name/vu/vue-language-server/package.nix | 6 +++++- pkgs/by-name/za/zashboard/package.nix | 5 +++-- .../python-modules/django-filingcabinet/default.nix | 13 ++++++++++--- .../python-modules/yt-dlp-ejs/default.nix | 7 +++++-- .../continuous-integration/woodpecker/webui.nix | 5 ++++- .../custom-sidebar/package.nix | 7 +++++-- .../custom-lovelace-modules/kiosk-mode/package.nix | 7 +++++-- pkgs/servers/web-apps/discourse/default.nix | 7 ++++--- 56 files changed, 250 insertions(+), 80 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix index ad57d3e15f26..8a6ae2e09101 100644 --- a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix +++ b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix @@ -3,7 +3,7 @@ pkgs, stdenv, fetchFromGitHub, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -12,6 +12,8 @@ }: let + pnpm = pnpm_10; + vsix = stdenv.mkDerivation (finalAttrs: { name = "gitlens-${finalAttrs.version}.vsix"; pname = "gitlens-vsix"; @@ -26,6 +28,7 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-Yuxuqr1BiviSw+dGNHLs2jAy8ADlBvRks6Kmy7FmCMw="; }; diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 627b30007bdb..ce082884d3d2 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -11,6 +11,8 @@ }: let + pnpm = pnpm_10; + vsix = stdenvNoCC.mkDerivation (finalAttrs: { name = "roo-code-${finalAttrs.version}.vsix"; pname = "roo-code-vsix"; @@ -25,6 +27,7 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-t2sPuhn8xdk6hGfmViPGG+5TAhtBBOMYNoOb6DlPzws="; }; diff --git a/pkgs/by-name/ag/agent-browser/package.nix b/pkgs/by-name/ag/agent-browser/package.nix index 327271bcb537..443788e686b5 100644 --- a/pkgs/by-name/ag/agent-browser/package.nix +++ b/pkgs/by-name/ag/agent-browser/package.nix @@ -5,7 +5,7 @@ fetchPnpmDeps, rustPlatform, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, geist-font, nix-update-script, @@ -14,6 +14,8 @@ }: let + pnpm = pnpm_10; + version = "0.27.0"; src = fetchFromGitHub { @@ -39,7 +41,7 @@ let pnpmDeps = fetchPnpmDeps { pname = "agent-browser-dashboard"; - inherit version src; + inherit version src pnpm; pnpmWorkspaces = [ "dashboard" ]; fetcherVersion = 3; hash = "sha256-ldxmXpejqVN/xuWcdLYMwNPc1VZ1rdNwRrumy8Is3N4="; diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index e7b0674f5b57..730dc2d4a2f2 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -7,7 +7,7 @@ # javascript fetchPnpmDeps, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, # python @@ -97,6 +97,8 @@ let hash = "sha256-qFgI65wAttERPCHn7ezSdNGB0sclEV7zYIBqaC0Gs4A="; }; + pnpm = pnpm_10; + airflowUi = stdenv.mkDerivation rec { pname = "airflow-ui-assets"; inherit src version; @@ -110,7 +112,12 @@ let pnpmDeps = fetchPnpmDeps { pname = "airflow-ui"; - inherit sourceRoot src version; + inherit + sourceRoot + src + version + pnpm + ; fetcherVersion = 3; hash = "sha256-zPIql9rP4EkE0Y3ihP4MkWTTYCIDr8d1LpE6vePiNdU="; }; diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix index ae23d134d633..b83f69f92c2f 100644 --- a/pkgs/by-name/ap/apache-answer/package.nix +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -4,11 +4,13 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, stdenv, }: - +let + pnpm = pnpm_10; +in buildGoModule (finalAttrs: { pname = "apache-answer"; version = "1.7.1"; @@ -28,6 +30,7 @@ buildGoModule (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) src version pname; + inherit pnpm; sourceRoot = "${finalAttrs.src.name}/ui"; fetcherVersion = 3; hash = "sha256-0Jqe0wig28Vb9y0/tZHDfE49MehNR7kJTpChz616tzU="; diff --git a/pkgs/by-name/au/authelia/package.nix b/pkgs/by-name/au/authelia/package.nix index 1db561604cfa..280b70dffc73 100644 --- a/pkgs/by-name/au/authelia/package.nix +++ b/pkgs/by-name/au/authelia/package.nix @@ -4,7 +4,7 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, fetchFromGitHub, buildGo125Module, installShellFiles, @@ -15,13 +15,15 @@ nodejs fetchPnpmDeps pnpmConfigHook - pnpm + pnpm_10 fetchFromGitHub ; }, }: let + pnpm = pnpm_10; + buildGoModule = buildGo125Module; inherit (import ./sources.nix { inherit fetchFromGitHub; }) diff --git a/pkgs/by-name/au/authelia/web.nix b/pkgs/by-name/au/authelia/web.nix index dd4f8851f0c8..3f5336adfca7 100644 --- a/pkgs/by-name/au/authelia/web.nix +++ b/pkgs/by-name/au/authelia/web.nix @@ -3,11 +3,13 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, fetchFromGitHub, }: let + pnpm = pnpm_10; + inherit (import ./sources.nix { inherit fetchFromGitHub; }) pname version diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index 8d0d34035e6b..d80ee5affbab 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -5,11 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, versionCheckHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "bumpp"; version = "11.0.1"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-nIj4S5BWTaw3RVNIxbla8Q31wvK67Of6psx5wX9ID+E="; }; diff --git a/pkgs/by-name/ch/changelogen/package.nix b/pkgs/by-name/ch/changelogen/package.nix index e4452f35f38f..4b55fa64c3ed 100644 --- a/pkgs/by-name/ch/changelogen/package.nix +++ b/pkgs/by-name/ch/changelogen/package.nix @@ -5,10 +5,13 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "changelogen"; version = "0.6.2"; @@ -22,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-S+GxeljcPj/MzBkleVNgaRa8D4kmHrKwwVqakmB5sAw="; }; diff --git a/pkgs/by-name/cl/claude-code-router/package.nix b/pkgs/by-name/cl/claude-code-router/package.nix index 1fd4c1903c31..fd21043b3c6f 100644 --- a/pkgs/by-name/cl/claude-code-router/package.nix +++ b/pkgs/by-name/cl/claude-code-router/package.nix @@ -4,12 +4,14 @@ lib, makeBinaryWrapper, nodejs, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, versionCheckHook, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "claude-code-router"; version = "2.0.0"; diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix index 20492fbabd6c..7544d9edaa64 100644 --- a/pkgs/by-name/co/context7-mcp/package.nix +++ b/pkgs/by-name/co/context7-mcp/package.nix @@ -7,12 +7,14 @@ versionCheckHook, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, fetchPnpmDeps, }: let tag-prefix = "@upstash/context7-mcp"; + + pnpm = pnpm_10; in stdenv.mkDerivation (finalAttrs: { pname = "context7-mcp"; @@ -34,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-f3PXpCdmKh2LPD5VyFsRdLR7CEvh+GozkQFSeeNuj2c="; }; diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix index f48c185548db..6c2ee732f9fe 100644 --- a/pkgs/by-name/co/conventional-changelog-cli/package.nix +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -5,12 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, makeBinaryWrapper, versionCheckHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "conventional-changelog-cli"; version = "7.2.0"; @@ -24,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-O91ypnycBwkfLSruezx9E5CrytguBdtmvgVhKFjUzvM="; }; diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix index 9df02ddda524..132a6b753e4a 100644 --- a/pkgs/by-name/ct/ctx7/package.nix +++ b/pkgs/by-name/ct/ctx7/package.nix @@ -7,10 +7,13 @@ versionCheckHook, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, fetchPnpmDeps, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "ctx7"; version = "0.3.9"; @@ -31,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-8RRHfCTZVC91T1Qx+ACCo2oG4ZwMNy5WYakCjmBhe3Q="; }; diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index c4cba7c6d64b..fe6791b038ba 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -15,7 +15,7 @@ commandLineArgs ? "", fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, asar, copyDesktopItems, darwin, @@ -23,6 +23,7 @@ }: let + pnpm = pnpm_10; electron = electron_41; seshat = callPackage ./seshat { }; in @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { version src ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk="; }; diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index bd13a9fc861b..a0d22d6c73c9 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -6,12 +6,14 @@ nodejs, jitsi-meet, fetchPnpmDeps, - pnpm, + pnpm_10, pnpmConfigHook, faketty, }: let + pnpm = pnpm_10; + noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org }; @@ -36,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { pname = "element"; inherit (finalAttrs) version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk="; }; diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix index cc7bde39533a..29ac289460c0 100644 --- a/pkgs/by-name/fr/froide/package.nix +++ b/pkgs/by-name/fr/froide/package.nix @@ -8,13 +8,14 @@ geos, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, postgresql, postgresqlTestHook, playwright-driver, }: let + pnpm = pnpm_10; python = python3Packages.python.override { packageOverrides = self: super: { @@ -120,7 +121,12 @@ python.pkgs.buildPythonApplication rec { ]; pnpmDeps = fetchPnpmDeps { - inherit pname version src; + inherit + pname + version + src + pnpm + ; fetcherVersion = 3; hash = "sha256-NbfCVD+gmtoxuYUCumTKj9P72utK787VdlnuU4lMMGc="; }; diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 8acddb6fb185..07c6d25cb601 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -19,7 +19,7 @@ pkg-config, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, rust, rustPlatform, turbo, @@ -27,7 +27,9 @@ wrapGAppsHook4, dart-sass, }: - +let + pnpm = pnpm_10; +in rustPlatform.buildRustPackage (finalAttrs: { pname = "gitbutler"; version = "0.19.7"; @@ -58,6 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-eRiFA5lXpPHQwlyFmKMx1zmHH2zLCHB+3s708g6srg4="; }; diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index dde80c010b73..bd18a6031ecf 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -13,19 +13,22 @@ openssh, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, stdenv, sqliteSupport ? true, nixosTests, }: let + pnpm = pnpm_10; + frontend = stdenv.mkDerivation (finalAttrs: { pname = "gitea-frontend"; inherit (gitea) src version; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-dewYYPO2wmNyYiQadoEKWJ10cghm6Lv7UE1iVlyNiEY="; }; diff --git a/pkgs/by-name/go/goaway/package.nix b/pkgs/by-name/go/goaway/package.nix index 3f9131cfaf61..a0e9cb7965eb 100644 --- a/pkgs/by-name/go/goaway/package.nix +++ b/pkgs/by-name/go/goaway/package.nix @@ -6,12 +6,14 @@ makeWrapper, net-tools, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, stdenvNoCC, }: let + pnpm = pnpm_10; + version = "0.63.15"; src = fetchFromGitHub { @@ -27,6 +29,7 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; sourceRoot = "${finalAttrs.src.name}/client"; fetcherVersion = 3; hash = "sha256-GM86Os1OQaagD61BEIIsqhWJNVPFA9Z5RiYWyHlQlwY="; diff --git a/pkgs/by-name/he/headplane/package.nix b/pkgs/by-name/he/headplane/package.nix index a596e5918356..2d71367644ea 100644 --- a/pkgs/by-name/he/headplane/package.nix +++ b/pkgs/by-name/he/headplane/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + pnpm = pnpm_10; hash = pnpmDepsHash; fetcherVersion = 3; }; diff --git a/pkgs/by-name/ki/kilocode-cli/package.nix b/pkgs/by-name/ki/kilocode-cli/package.nix index e86cbcf5bb0b..e12c8b0c31b9 100644 --- a/pkgs/by-name/ki/kilocode-cli/package.nix +++ b/pkgs/by-name/ki/kilocode-cli/package.nix @@ -8,7 +8,7 @@ nodejs, writableTmpDirAsHomeHook, pnpmConfigHook, - pnpm, + pnpm_10, unzip, patchelf, autoPatchelfHook, @@ -16,6 +16,9 @@ versionCheckHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "kilocode-cli"; version = "0.25.1"; @@ -29,6 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-Q/LamZwVaIQVILtXRi1RQrYtpxYJWEKPAt3knwm47S0="; }; diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix index 5eb9e42d0dd8..cffa8b07821f 100644 --- a/pkgs/by-name/mc/mcporter/package.nix +++ b/pkgs/by-name/mc/mcporter/package.nix @@ -5,12 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, versionCheckHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "mcporter"; version = "0.10.2"; @@ -24,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-TZfEoUSjba8cRz6L9uY2PGskYsR7S/xAahiKLd8dhFM="; }; diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index 805ca74c1352..bd2ee2ad634d 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -7,9 +7,11 @@ lib, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, }: let + pnpm = pnpm_10; + version = "0.25.3"; src = fetchFromGitHub { owner = "usememos"; @@ -23,6 +25,7 @@ let inherit version src; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; sourceRoot = "${finalAttrs.src.name}/web"; fetcherVersion = 3; hash = "sha256-xEOnxCgBD4uLypcZzCO+31S4r0sSfz8PpgEmZASeRZ4="; diff --git a/pkgs/by-name/mg/mgrep/package.nix b/pkgs/by-name/mg/mgrep/package.nix index 6d6673521f7f..0ac21b3c56d3 100644 --- a/pkgs/by-name/mg/mgrep/package.nix +++ b/pkgs/by-name/mg/mgrep/package.nix @@ -1,15 +1,18 @@ { lib, + pnpm_10, stdenv, fetchFromGitHub, nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, npmHooks, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "mgrep"; version = "0.1.10"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-T1mbRDBLU4SjZSgqyKgusZe5UV9hI+/bAmBYoAWcWtQ="; }; diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix index d5fc3de191b8..b4f00cfed13a 100644 --- a/pkgs/by-name/mo/moonlight/package.nix +++ b/pkgs/by-name/mo/moonlight/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -12,6 +12,9 @@ discord-canary, discord-development, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "moonlight"; version = "2026.5.0"; @@ -31,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-veZx/b+cvpcRh1xXO8Y34dJtY2cgncqVSYYywb85Geo="; }; diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index 619549072a3c..e885f5a3703b 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -5,11 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, versionCheckHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "ni"; version = "30.1.0"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-I/jf6nlsKQFrYLO15f+CWdPPdEpVDDMBQodLsbG4sqw="; }; diff --git a/pkgs/by-name/nr/nrm/package.nix b/pkgs/by-name/nr/nrm/package.nix index 7e814d867a14..f01121f472de 100644 --- a/pkgs/by-name/nr/nrm/package.nix +++ b/pkgs/by-name/nr/nrm/package.nix @@ -5,11 +5,13 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, makeBinaryWrapper, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "nrm"; version = "2.1.0"; @@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-DvhUXkh9Ijuik9uWzPOtM1idSNSaJxDiRHWpUMepf3U="; }; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 1991beab067c..084331ade53a 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -18,7 +18,7 @@ tesseract5, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, poppler-utils, liberation_ttf, xcbuild, @@ -29,6 +29,8 @@ lndir, }: let + pnpm = pnpm_10; + version = "2.20.15"; src = fetchFromGitHub { diff --git a/pkgs/by-name/pi/picgo/package.nix b/pkgs/by-name/pi/picgo/package.nix index 773264d13e62..6692f1434b70 100644 --- a/pkgs/by-name/pi/picgo/package.nix +++ b/pkgs/by-name/pi/picgo/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nodejs_22, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, electron_40, @@ -13,7 +13,9 @@ writableTmpDirAsHomeHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "picgo"; version = "2.5.3"; @@ -27,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) version src; + inherit pnpm; pname = "picgo"; hash = "sha256-tILvWDoHAN5XT1F/cJYgfeMzowuO/fhiughI+0FvHzc="; fetcherVersion = 3; # lockfileVersion 9.0 corresponds to fetcherVersion 3 diff --git a/pkgs/by-name/po/postcss/package.nix b/pkgs/by-name/po/postcss/package.nix index 3fc2a6198896..7ba6581adad9 100644 --- a/pkgs/by-name/po/postcss/package.nix +++ b/pkgs/by-name/po/postcss/package.nix @@ -4,11 +4,13 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "postcss"; version = "8.5.10"; @@ -28,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-7SwgvsbSbRj1SZAEhjWp3B4D3VtAvg7UN35/5x3f5Wk="; }; diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix index b190ffa04be3..8453d212767d 100644 --- a/pkgs/by-name/sa/satisfactorymodmanager/package.nix +++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix @@ -3,7 +3,7 @@ stdenv, buildGoModule, fetchFromGitHub, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, wails, @@ -12,7 +12,9 @@ makeDesktopItem, copyDesktopItems, }: - +let + pnpm = pnpm_10; +in buildGoModule rec { pname = "satisfactorymodmanager"; version = "3.0.5"; @@ -58,6 +60,7 @@ buildGoModule rec { pname version src + pnpm ; sourceRoot = "${src.name}/frontend"; fetcherVersion = 3; diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix index 2d7d87a48ba1..c25c9ed69c06 100644 --- a/pkgs/by-name/se/session-desktop/package.nix +++ b/pkgs/by-name/se/session-desktop/package.nix @@ -8,7 +8,7 @@ makeWrapper, fetchpatch, replaceVars, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, rustPlatform, @@ -27,6 +27,8 @@ }: let + pnpm = pnpm_10; + fake-git = writeShellScriptBin "git" (lib.readFile ./fake-git.sh); libsession-util-nodejs = stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/sf/sftool-gui/package.nix b/pkgs/by-name/sf/sftool-gui/package.nix index f3093c92e031..1f5e876ad3ba 100644 --- a/pkgs/by-name/sf/sftool-gui/package.nix +++ b/pkgs/by-name/sf/sftool-gui/package.nix @@ -1,5 +1,6 @@ { lib, + pnpm_10, stdenv, rustPlatform, cargo-tauri, @@ -9,7 +10,6 @@ systemdLibs, fetchPnpmDeps, pnpmConfigHook, - pnpm, openssl, nix-update-script, pkg-config, @@ -18,6 +18,9 @@ autoPatchelfHook, fetchFromGitHub, }: +let + pnpm = pnpm_10; +in rustPlatform.buildRustPackage (finalAttrs: { pname = "sftool-gui"; version = "1.1.4-unstable-2026-04-16"; @@ -41,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { fetcherVersion = 3; inherit (finalAttrs) pname version src; + inherit pnpm; hash = "sha256-DwDXfbwgt/OSNOQbzCBlathX9QDnbEsXZLsgB67LOEk="; }; diff --git a/pkgs/by-name/sh/shiru/package.nix b/pkgs/by-name/sh/shiru/package.nix index 71f050bff3e9..6a1edc181684 100644 --- a/pkgs/by-name/sh/shiru/package.nix +++ b/pkgs/by-name/sh/shiru/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - pnpm, + pnpm_10, nodejs, fetchFromGitHub, python3, @@ -14,6 +14,7 @@ nix-update-script, }: let + pnpm = pnpm_10; electron = electron_39; in stdenv.mkDerivation (finalAttrs: { @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; prePnpmInstall = '' cd electron ''; diff --git a/pkgs/by-name/sh/shoko-webui/package.nix b/pkgs/by-name/sh/shoko-webui/package.nix index b537f3d6e6d3..5e25f5c5bf22 100644 --- a/pkgs/by-name/sh/shoko-webui/package.nix +++ b/pkgs/by-name/sh/shoko-webui/package.nix @@ -3,12 +3,15 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, lib, shoko, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "shoko-webui"; version = "2.4.1"; @@ -27,6 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-rTlem83dFptgvKUKUaHK8vi5B0FBehPFtkCUhOnUKd0="; }; diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index 52bed4866986..3bbfbfad441c 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, faketty, nodejs_22, versionCheckHook, @@ -12,6 +12,8 @@ nix-update-script, }: let + pnpm = pnpm_10; + nodejs = nodejs_22; pnpm' = pnpm.override { inherit nodejs; }; in @@ -28,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-gwEVlvr8hxgyCsGjxjz1UkbDZYYq1iukKTPJ7JHdo2U="; }; diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix index 19de85ad5277..a55faadb62c7 100644 --- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -1,8 +1,8 @@ { stdenv, + pnpm, lib, fetchFromGitHub, - pnpm, fetchPnpmDeps, pnpmConfigHook, nodejs, diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix index 7fbaff73ff6e..9a8cabd2aa40 100644 --- a/pkgs/by-name/sk/skills/package.nix +++ b/pkgs/by-name/sk/skills/package.nix @@ -3,12 +3,15 @@ stdenv, fetchFromGitHub, fetchPnpmDeps, - pnpm, + pnpm_10, nodejs, pnpmConfigHook, nix-update-script, testers, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "skills"; version = "1.5.1"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { fetcherVersion = 3; inherit (finalAttrs) pname version src; + inherit pnpm; hash = "sha256-0CS6BTjTj/TAnMNahTk4Vt/0/2eMxmCGUV9PwI8l4Ao="; }; diff --git a/pkgs/by-name/sl/slidev-cli/package.nix b/pkgs/by-name/sl/slidev-cli/package.nix index 1cf9d00585b2..a73a7378e8a5 100644 --- a/pkgs/by-name/sl/slidev-cli/package.nix +++ b/pkgs/by-name/sl/slidev-cli/package.nix @@ -3,11 +3,14 @@ stdenv, fetchFromGitHub, fetchPnpmDeps, - pnpm, + pnpm_10, nodejs, pnpmConfigHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "slidev-cli"; version = "52.15.1"; @@ -28,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-DGDzNvau1XjPjkGZqcFZGkjYd3cneXO/gCdnwjjkQDY="; }; diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix index 17bb24a7275d..bd10387d4e03 100644 --- a/pkgs/by-name/sp/sparkle/package.nix +++ b/pkgs/by-name/sp/sparkle/package.nix @@ -22,6 +22,8 @@ }: let + pnpm = pnpm_10_29_2; + sparkle-service = buildGoModule { pname = "sparkle-service"; version = "0-unstable-2025-10-24"; @@ -37,8 +39,6 @@ let meta.mainProgram = "sparkle-service"; }; - - pnpm = pnpm_10_29_2; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix index 3de1b23a1b9e..0bb281c721b5 100644 --- a/pkgs/by-name/su/sub-store-frontend/package.nix +++ b/pkgs/by-name/su/sub-store-frontend/package.nix @@ -4,13 +4,14 @@ fetchFromGitHub, pnpm_10, - pnpm ? pnpm_10, fetchPnpmDeps, pnpmConfigHook, nix-update-script, nodejs, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "sub-store-frontend"; version = "2.16.79"; diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix index 8b7b2580f12a..b1f1587bcd10 100644 --- a/pkgs/by-name/su/sub-store/package.nix +++ b/pkgs/by-name/su/sub-store/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pnpm_10, - pnpm ? pnpm_10, fetchPnpmDeps, pnpmConfigHook, makeBinaryWrapper, @@ -12,7 +11,9 @@ nodejs, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "sub-store"; version = "2.22.15"; diff --git a/pkgs/by-name/sv/svelte-check/package.nix b/pkgs/by-name/sv/svelte-check/package.nix index 98a09588b8f1..c2db29dcf953 100644 --- a/pkgs/by-name/sv/svelte-check/package.nix +++ b/pkgs/by-name/sv/svelte-check/package.nix @@ -4,11 +4,14 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, makeBinaryWrapper, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "svelte-check"; version = "4.3.1"; @@ -29,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-43AIkVzpcq/Y+QO2k7pkr6CN340idXJEpie0gVdxra8="; }; diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index 533851c95ed9..4b35a31e042d 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -4,11 +4,14 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, makeBinaryWrapper, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "svelte-language-server"; version = "0.17.31"; @@ -29,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-x0yIANla1KURJ4fgxAe9WUJl/sPAsUcARubTJQ5uEpQ="; }; diff --git a/pkgs/by-name/ta/tabularis/package.nix b/pkgs/by-name/ta/tabularis/package.nix index 3668c683d48c..513d5fad50f6 100644 --- a/pkgs/by-name/ta/tabularis/package.nix +++ b/pkgs/by-name/ta/tabularis/package.nix @@ -6,7 +6,7 @@ fetchPnpmDeps, cargo-tauri, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, wrapGAppsHook4, webkitgtk_4_1, @@ -14,6 +14,9 @@ openssl, nix-update-script, }: +let + pnpm = pnpm_10; +in rustPlatform.buildRustPackage (finalAttrs: { pname = "tabularis"; version = "0.9.12"; @@ -38,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-S/XCypKyYlJtuISNiG8NtJzisAejiUwqPVltXEmVlZw="; }; diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix index 8ebb5226dd57..45ba2f5853f3 100644 --- a/pkgs/by-name/ty/typespec/package.nix +++ b/pkgs/by-name/ty/typespec/package.nix @@ -7,12 +7,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, versionCheckHook, }: let workspace = "@typespec/compiler..."; + + pnpm = pnpm_10; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "typespec"; @@ -41,6 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces postPatch ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-wZvnRSALrupyhpSN8zNL3b6SZnVPXX3BdHrbzHUNtUg="; }; diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 058505f9846e..d5a95c25f349 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -9,7 +9,7 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, prisma_7, prisma-engines_7, openssl, @@ -20,6 +20,8 @@ basePath ? "", }: let + pnpm = pnpm_10; + sources = lib.importJSON ./sources.json; geocities = stdenvNoCC.mkDerivation { @@ -107,6 +109,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { version src ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-QNWmCsVFh8xpsO4ZPTaKGszwuRaxTrWLMVh/6VV5oIw="; }; diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index c0618fd6c98a..866e5c01d1b3 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -17,6 +17,9 @@ discord-development, buildWebExtension ? false, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "vencord"; version = "1.14.13"; @@ -42,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { patches postPatch ; - pnpm = pnpm_10; + inherit pnpm; fetcherVersion = 3; hash = "sha256-hk1rnNog5xvuIVI0M1ZJ5xrEuk0zcBiYsbROUycdi+A="; }; @@ -51,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { git nodejs pnpmConfigHook - pnpm_10 + pnpm ]; env = { diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 06c129532f6c..0a09412135f4 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -4,11 +4,14 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, nix-update-script, makeBinaryWrapper, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; version = "3.2.6"; @@ -22,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-koRJkT/JloptmtQKLprqms53TL/Q4XHaktIl/6PIasw="; }; diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index e51531e8ab94..a312f87604df 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -3,12 +3,13 @@ buildNpmPackage, fetchFromGitHub, pnpm_10, - pnpm ? pnpm_10, fetchPnpmDeps, pnpmConfigHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "zashboard"; version = "3.5.1"; diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix index 9dd305b3ad37..c98095bd08a1 100644 --- a/pkgs/development/python-modules/django-filingcabinet/default.nix +++ b/pkgs/development/python-modules/django-filingcabinet/default.nix @@ -31,12 +31,14 @@ playwright-driver, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, markdown, nh3, }: - +let + pnpm = pnpm_10; +in buildPythonPackage rec { pname = "django-filingcabinet"; version = "0.17-unstable-2025-08-14"; @@ -96,7 +98,12 @@ buildPythonPackage rec { }; pnpmDeps = fetchPnpmDeps { - inherit pname version src; + inherit + pname + version + src + pnpm + ; fetcherVersion = 3; hash = "sha256-p+RpEDVbdYmeSD4bB0oUMrTpsVDGYkqME13awnoTNd0="; }; diff --git a/pkgs/development/python-modules/yt-dlp-ejs/default.nix b/pkgs/development/python-modules/yt-dlp-ejs/default.nix index 4157f6d99236..d53cade836be 100644 --- a/pkgs/development/python-modules/yt-dlp-ejs/default.nix +++ b/pkgs/development/python-modules/yt-dlp-ejs/default.nix @@ -7,9 +7,11 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, }: - +let + pnpm = pnpm_10; +in buildPythonPackage rec { pname = "yt-dlp-ejs"; version = "0.8.0"; @@ -27,6 +29,7 @@ buildPythonPackage rec { pname version src + pnpm ; fetcherVersion = 3; hash = "sha256-4qMOAl9Dbe1oYSRIeP7oPcV/+P8NLdIYvSNxaz0h+Z0="; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix index 31197106a149..a4b8f9312f3e 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix @@ -5,10 +5,12 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, }: let common = callPackage ./common.nix { }; + + pnpm = pnpm_10; in stdenv.mkDerivation (finalAttrs: { pname = "woodpecker-webui"; @@ -18,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; sourceRoot = "${common.src.name}/web"; fetcherVersion = 3; hash = common.nodeModulesHash; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix index 1d3bf1706612..935a7bdba7d4 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix @@ -4,10 +4,12 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, }: - +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "custom-sidebar"; version = "14.0.0"; @@ -21,6 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-gYNCjCeAt6LP4tZE4ufiQu7OG2ujWydm4etcGQxMxcU="; }; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix index 7b29dd502564..f85502db309a 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix @@ -4,10 +4,12 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, }: - +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "kiosk-mode"; version = "13.1.0"; @@ -21,6 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-k7kXZ4yFe3As1IGijrmJfgqrMoO2Yi+PrNapuq8Ow3Y="; }; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 5c572d71511d..96aba467b7be 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -39,7 +39,7 @@ buildRubyGem, rustc, cargo, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, svgo, @@ -62,6 +62,8 @@ let sha256 = "sha256-0jbO1rJQ0AISo7h+SZfovubReCjR2zT6KWX9LxBeFtE="; }; + pnpm = pnpm_10; + ruby = ruby_3_3; runtimeDeps = [ @@ -303,8 +305,7 @@ let pnpmDeps = fetchPnpmDeps { pname = "discourse-assets"; - inherit version src; - pnpm = pnpm; + inherit version src pnpm; fetcherVersion = 3; hash = "sha256-xft/2x0iti0yJ53uI9q2+FSvKgWWfKQzlMlPFz3RZsE="; }; From 921251820708a876752a4aa1f1f3e7b808e61ac2 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 31 Mar 2026 16:38:02 +0200 Subject: [PATCH 34/59] pnpm-fixup-state-db: init at 1.0.0 Signed-off-by: Sefa Eyeoglu --- .../node/fetch-pnpm-deps/default.nix | 14 ++ .../pn/pnpm-fixup-state-db/package.nix | 34 +++ .../pn/pnpm-fixup-state-db/src/.gitignore | 2 + .../pn/pnpm-fixup-state-db/src/index.ts | 61 ++++++ .../pnpm-fixup-state-db/src/package-lock.json | 200 ++++++++++++++++++ .../pn/pnpm-fixup-state-db/src/package.json | 19 ++ .../pn/pnpm-fixup-state-db/src/tsconfig.json | 10 + pkgs/development/tools/pnpm/generic.nix | 2 +- pkgs/test/pnpm/default.nix | 1 + .../test/pnpm/pnpm-fixup-state-db/default.nix | 23 ++ pkgs/test/pnpm/pnpm-fixup-state-db/index.db | Bin 0 -> 65536 bytes 11 files changed, 365 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/package.nix create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json create mode 100644 pkgs/test/pnpm/pnpm-fixup-state-db/default.nix create mode 100644 pkgs/test/pnpm/pnpm-fixup-state-db/index.db diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index 6b33c263b895..80b637b57ddf 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -7,6 +7,7 @@ cacert, makeSetupHook, pnpm, + pnpm-fixup-state-db, writableTmpDirAsHomeHook, yq, zstd, @@ -47,6 +48,14 @@ in }; filterFlags = lib.map (package: "--filter=${package}") pnpmWorkspaces; + + pnpm-fixup-state-db' = + if pnpm.nodejs or null != null then + pnpm-fixup-state-db.override { + inherit (pnpm) nodejs; + } + else + pnpm-fixup-state-db; in # pnpmWorkspace was deprecated, so throw if it's used. assert (lib.throwIf (args ? pnpmWorkspace) @@ -77,6 +86,7 @@ in jq moreutils pnpm # from args + pnpm-fixup-state-db' yq zstd ] @@ -146,6 +156,10 @@ in jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f done + if [ -f "$storePath/v11/index.db" ]; then + pnpm-fixup-state-db "$storePath/v11"; + fi + # This folder contains symlinks to /build/source which we don't need # since https://github.com/pnpm/pnpm/releases/tag/v10.27.0 rm -rf $storePath/{v3,v10}/projects diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix b/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix new file mode 100644 index 000000000000..66c5da928e16 --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix @@ -0,0 +1,34 @@ +{ + buildNpmPackage, + lib, + nodejs, + pnpm, + tests, +}: +buildNpmPackage { + pname = "pnpm-fixup-state-db"; + version = "1.0.0"; + + src = ./src; + + inherit nodejs; + + npmDepsHash = "sha256-um6a4pEtPtdxHBRq9g5ZW20wIQAMjWJ3qF96XuxJg8o="; + + postInstall = '' + makeWrapper ${lib.getExe nodejs} $out/bin/pnpm-fixup-state-db \ + --add-flags "$out/lib/node_modules/pnpm-fixup-state-db" + ''; + + passthru.tests = { + inherit (tests) pnpm; + }; + + __structuredAttrs = true; + + meta = { + license = lib.licenses.mit; + mainProgram = "pnpm-fixup-state-db"; + inherit (pnpm.meta) maintainers; + }; +} diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore b/pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore new file mode 100644 index 000000000000..23a608b6addd --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore @@ -0,0 +1,2 @@ +node_modules +*.js diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts b/pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts new file mode 100644 index 000000000000..648af50f3545 --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts @@ -0,0 +1,61 @@ +#!/usr/bin/env node +import { packForStorage, StoreIndex } from '@pnpm/store.index'; + +interface FileMetadata { + checkedAt: number; +} + +interface Metadata { + files: Map; +} + +function validateMetadata(data: unknown): data is Metadata { + return (data as Metadata).files instanceof Map; +} + +// from https://github.com/pnpm/pnpm/blob/52ee08aad4fcc0dfb92bc35cc5aaf3d07f8f3246/worker/src/start.ts#L235 +function packToShared (data: unknown): Uint8Array { + const packed = packForStorage(data) + const shared = new SharedArrayBuffer(packed.byteLength) + const view = new Uint8Array(shared) + view.set(packed) + return view +} + +const main = () => { + const storePath = process.argv[2]; + const index = new StoreIndex(storePath); + + const newEntries = [] as Parameters[0] + + for (const [key, data] of index.entries()) { + console.debug(`Mapping ${key}...`); + if (!validateMetadata(data)) { + console.debug(`Data of ${key}:`, data); + throw new Error(`Failed to read data for ${key}`); + } + const newFiles = new Map(); + for (const [path, metadata] of data.files.entries()) { + newFiles.set(path, { + ...metadata, + checkedAt: 0, + }); + } + newEntries.push({ + key, + buffer: packToShared({ + ...data, + files: newFiles, + } as Metadata) + }); + } + + // As pnpm is highly parallelized, the order of the data in the database is random. Therefore, we need to sort our changed data and replace all data in the database + const sortedEntries = newEntries.sort((a, b) => a.key > b.key ? 1 : -1); + + // Delete all entries and add them in a deterministic order + index.deleteMany(sortedEntries.map(m => m.key)); + index.setRawMany(sortedEntries); +}; + +main(); diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json new file mode 100644 index 000000000000..0e0a14c8b47c --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json @@ -0,0 +1,200 @@ +{ + "name": "pnpm-fixup-state-db", + "version": "0.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "pnpm-fixup-state-db", + "version": "0.0.0", + "license": "MIT", + "dependencies": { + "@pnpm/store.index": "^1100.0.0" + }, + "devDependencies": { + "@types/node": "^25.6.0", + "typescript": "^6.0.3" + } + }, + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz", + "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz", + "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz", + "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz", + "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz", + "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz", + "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@pnpm/store.index": { + "version": "1100.0.0", + "resolved": "https://registry.npmjs.org/@pnpm/store.index/-/store.index-1100.0.0.tgz", + "integrity": "sha512-eVd5DHiD6hyr2hrkIlh3z07SOiVqoGvFnPAb+rL6piXd9889trSyUjDXBlkJj7gyipAQoo8xMHHixoPp/sHnFA==", + "license": "MIT", + "dependencies": { + "msgpackr": "1.11.8" + }, + "engines": { + "node": ">=22.13" + }, + "funding": { + "url": "https://opencollective.com/pnpm" + } + }, + "node_modules/@types/node": { + "version": "25.6.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz", + "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~7.19.0" + } + }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "license": "Apache-2.0", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/msgpackr": { + "version": "1.11.8", + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.8.tgz", + "integrity": "sha512-bC4UGzHhVvgDNS7kn9tV8fAucIYUBuGojcaLiz7v+P63Lmtm0Xeji8B/8tYKddALXxJLpwIeBmUN3u64C4YkRA==", + "license": "MIT", + "optionalDependencies": { + "msgpackr-extract": "^3.0.2" + } + }, + "node_modules/msgpackr-extract": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz", + "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "dependencies": { + "node-gyp-build-optional-packages": "5.2.2" + }, + "bin": { + "download-msgpackr-prebuilds": "bin/download-prebuilds.js" + }, + "optionalDependencies": { + "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3", + "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3" + } + }, + "node_modules/node-gyp-build-optional-packages": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz", + "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==", + "license": "MIT", + "optional": true, + "dependencies": { + "detect-libc": "^2.0.1" + }, + "bin": { + "node-gyp-build-optional-packages": "bin.js", + "node-gyp-build-optional-packages-optional": "optional.js", + "node-gyp-build-optional-packages-test": "build-test.js" + } + }, + "node_modules/typescript": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undici-types": { + "version": "7.19.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz", + "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==", + "dev": true, + "license": "MIT" + } + } +} diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json new file mode 100644 index 000000000000..17da52cd5e9e --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json @@ -0,0 +1,19 @@ +{ + "name": "pnpm-fixup-state-db", + "version": "0.0.0", + "description": "Fixup pnpm v11-store index.db to remove impurities", + "license": "MIT", + "author": "Sefa Eyeoglu ", + "type": "module", + "main": "index.js", + "dependencies": { + "@pnpm/store.index": "^1100.0.0" + }, + "devDependencies": { + "@types/node": "^25.6.0", + "typescript": "^6.0.3" + }, + "scripts": { + "build": "tsc" + } +} diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json b/pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json new file mode 100644 index 000000000000..55cc552808e3 --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json @@ -0,0 +1,10 @@ +{ + "compilerOptions": { + "module": "nodenext", + "target": "esnext", + "lib": ["esnext"], + "types": ["node"], + "strict": true + }, + "include": ["index.ts"] +} diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 82253bf52d46..76a0b40835e4 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -103,7 +103,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; }) ); - inherit majorVersion; + inherit nodejs majorVersion; tests.version = lib.optionalAttrs withNode ( testers.testVersion { package = finalAttrs.finalPackage; } diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix index 1e7d882ce295..85874ec1a57f 100644 --- a/pkgs/test/pnpm/default.nix +++ b/pkgs/test/pnpm/default.nix @@ -1,4 +1,5 @@ { callPackage }: { pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { }; + pnpm-fixup-state-db = callPackage ./pnpm-fixup-state-db { }; } diff --git a/pkgs/test/pnpm/pnpm-fixup-state-db/default.nix b/pkgs/test/pnpm/pnpm-fixup-state-db/default.nix new file mode 100644 index 000000000000..f4c47ae00efa --- /dev/null +++ b/pkgs/test/pnpm/pnpm-fixup-state-db/default.nix @@ -0,0 +1,23 @@ +{ + pnpm-fixup-state-db, + testers, + sqlite, +}: +testers.runCommand { + name = "pnpm-fixup-state-db-test"; + + nativeBuildInputs = [ + pnpm-fixup-state-db + sqlite + ]; + + script = '' + install -Dm644 ${./index.db} ./store/index.db + + pnpm-fixup-state-db ./store + + cp ./store/index.db $out + ''; + + hash = "sha256-tjpKgdMvDcs0X65PENIsiHELYPzVupEH3jS4PyLsF40="; +} diff --git a/pkgs/test/pnpm/pnpm-fixup-state-db/index.db b/pkgs/test/pnpm/pnpm-fixup-state-db/index.db new file mode 100644 index 0000000000000000000000000000000000000000..705910416a042a68be532125cea69f6f6ee943dc GIT binary patch literal 65536 zcmWFz^vNtqRY=P(%1ta$FlG>7U}9o$P*7lCU|?rpU=UzH05%2&1{MUDff0#~i^jR?{7 zW?~apRb`9@D=#k0$t+2YFD^+eF+^rFqZoiJqfwHSqm!9Zp###R*(lG*F0QW5*jNiT zt{^cvJ25>qJ~J;RwE~61gkm6yl!6AA0vu$gR)U?W5D?_)>lhTN;O!czgCw7lSdysV zk z4S~@R7!85Z5Eu=C(GVC7f#Def?~K_R3mb1U6=x)x8XD_QXFG>_ z`ve7qg%-Fc`k4BLxs|(F1i6$32UV4%m8bg|mgg3FrTPXZdFSN0mIM}tT7(v5gydGa z=0>HI8hM(P8Ko2ym`8Y4l-t^JI+Rovq!#Pv<)@@N7@6vs>KR-qa+tEVD7COOvnaLL zsWdYuWkqgcUS?WqamkXzob>#qX_+~x#fPpGIZjz#mReMtnV+{NCAAV|^U)FKxo(Pc2hohGg+%}dEl&eR3lyu8j_&(K28U^S9Mt`s>>SO)RMk&dL7D*OKhL#qFre>+e=H`iJhKXjW z2Bt~L7DgtfMiyzwi3VvFsb+?W$;OsRhQ{WJ21XVJMwV%57DlP2Mn;y2DJBL6iN?vv zMn#CQV;=*vVA=$zx&CTHE3)*7MD6#rKP!h zcvU6^Ck7Se7MZ4c6j>PNmV1R7XJ?h0`D&LI6or>LM`Ze?`dJ41yO#$Vd*xYVC0XPe zN10_-g{5cb^oItCa87WqW#gK{@=PICZfG!i0w5-h^OIeHmHJ4)t-XHq>x zCUqi^NfS*?4b2kG%}r7aQ%us*QVi0P&CDzflgx}0&CE>9jFK!8)6y&qQ&W>IEG-k0 zQWH%qO%sz%Oj1pgEiH_bjLZyD%`8pLlPpt=%uLKolFd?*jT6&SQW7nbQVk4K4UH0w zOp?t^42=yeEs{-)!5Pia#L(Enz}(oxA~hMDNuAa}JO6rF#rb(o3^yB65{(Vaj8aWf zlP%0FP0Wmq%u~!vEsPCKQ_PbL5|dI5Qd5l#ER)lcOp;7YlTFN0Qc_b=jnj-R3=NVE z4b#lijEs%U(kzV=&5SJ4%*@SAQ%#I4EKDqoEf^RWSV431jQn>Q`0ozS+G^BSqaiRF z0;3@?8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFziD>kRT^Kr`fMwNzv4SC}|BtfD zf7l1gs0T+wU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmkh5(yUN>Zw6iiufb za!Qg(vRQJPrBQN{v1zK2Nm^=>rJ(Aor3!^9K=qr@b0bK_KV zgETW^vqaDuiqw=u0|PVA$_A5U^F%`vgXA<*LsKKOMDrALgEYg$)U>ozbIT-i0~5=X zBvYf*#1xa1RAbW=LvypV#METtG*j~wgS3=XbMrLwWMfm4MAM{1V{_A_)YO!;)HF-O zG$S)(149EtBaoXIkFQEhPt7aQOVKMS201D%(a=1})Xd1x#K-)HpT8IK?O_ zDaF#r(mXXW*}~MsFe%w2#Udpw)!Za4*(}l0#4^n?&A`~)C@Cp5*~la%IVs7|!Zg_^ z$QcWnwc0FS*E5WC#4u#8XBaeBpW6sTBf9$ z8CfP8SePXnTNs%er5G9+Cm9(S7$#bpr5PHT8W@=y7^YdICK;QW85kOy8Je1#rJ0)~ zo2407n3$wlnwl6GnOLS8CYczSnI&5ont+_d=D8^;F$c6fDMhy+KR*ZV zILp)|qcr2h6tiT|x{ySZWHUp{B+KMfBXf)7G;<@P6eGhFOUo2sLGcyM}j`{btXK0aVVPR>RVr*z^Y-ntmoM>!hmYAAqlxk#XU}6H@~d!$eaHBO|jki{zxVL^HEA(?oM)&=Np%lN3us^F+hc zG)t4DR73OB#FUg2Q={Z$6BEm%6r&^y(89blBXcuD%T#kC%fw`hWCO@*p~oAOb23x& zN_0WHjf&xJGc!vvG*2^5u}n2jHZ?T0urRQ+G%_}_NHs~Zut>5@O-eR3HcK|Mw6IJu zF*QsxGc!p|Oif8kHc2rsO-)KOGfp-%H%>`ONis4uG*2=zPEJWlNi;VzHb?}8ZHkeh zfw@JRnTeUPrHQFgig{8}VzO~!l8LElim|0(S_(J^FrHWqaU0xKsV0ymQsyS9#wNyw zCWeU?DaMw@=9Wpx7KX+~mMLjTW{HL-hUR7lsfNZzrlv;bY00K(Nl6AK=0>K;7O6?* zNhXP)>|v5>Y>{f1lxS{fZjzP=T0&)+Xl!X}VPT$XW@coPWNcw+VwPfIV3}raW}cXu znwVl}Xqg0xM&SwTlJoQOQj?L>mszrjWujSHib;~0k%dKal5uisYN};&s+mz*VzPNk zqM@;+k$F;DYKoiNlH?Zr6Fj^rFlxSWm=MHTC#~nqD4}Y zrG-&Ss-=aIrG<%UilJGuftg{lu|cwdsez?YlA(E`ftj&cN{X>zvSA{~VJ!R`lk@XR zKye9LQwR^V6hi}Z6B7di0|RrA`^=4#Q;ZD_j7=?*L4=8!fl;clxdkZi8>CpKrJ1HA znHpFmSs0t7fuh>X(j1h`Q&SC+lTr;p`8&tX^Np`qCsj}a3MN+b1vPEKwfr(MFsZnxjl8K3BN@|)#T53w7siBFP ziJ1Y|Svz*5WG1HPa}$$9 zi$tSjqeMd^BhbP)V>81PLnG5v19S64a}y&2!{p=?10!RLREso|BoiZxMDx@nQwtMQ zP=#Y`YMz{CoNAn$mTaDCXq04OnwXfHXqsYanVM#5V4jp{nq+8bX=G(%9_nIxNmig@!xBNKBAGXujEOS2?1GYg}{#56-Qi{zw4%cL|@1H(jf zW7A~I)YK$%OCxhLV`F2(Wb;G|vP$u2d?EXmj~B{k8&GBG91&?wQ+ zBGtgc(!#(3R4^D?8YCJTnVVatnkS{0S{jIcKrBqLJ`QwuXgb7SMwB!eV_ zlthzcBlEPhq{Niuq*SAnM2nOp(_}+XaSW=#lFdy_EG&#I%qL>Of@mIFibK`Nli1fFi%c3wy-oa2QTqvXIhn(T9TXrca))J zs(!w;& zAko0s$k;N;)Wpy-HOyv0k)c^)O0rp^v1KBtB(Y3RF*i;&HZ(Oc1{GyS=4mPB#)%e|Nyg@hrYQ!N#^!0J zhRJEBiN>ahDJCYM;wRbM(je6^HOb5zRHU1kSr{Z5r5akMrKBbs8W|>;B_>;>ftwt{ z6St-3NO=wi#F29_zw$!4a;$*D#uDM@K&rfHzk$-pSZ*d)!u(Ae12EG5OvDA_#O zGR45qz{n&u#lj-lJk2c4)Y8n{JlQhI#K6SZG|?!{G{r2Nj3U7isFuy1>Ju?p;dd6wSpa!lPsBLSR znwFNBY?5l4Xq04NXqIS^WNDmeXq04NY;K%rX`TqqbcO~dNr_3upmthfqJ<%76|hla zia{!<0yjuAwzM!cGd43bO*Ke0F)^@AwlFbE1m$RR^TcF}q|{`yWOGxK)D(kM%M_!O z6mZky%!c(DM#;KpHN1tTp=qj#L82)rF`F5rrkPq8CL1IrrKBb$8K#&RrWmJMq?(&1 zo2HtWCmS0jftqFJhDIrt7Kw?8$!TVWCaEUo#z`h7N#@3821e#-X68ob7A7esCT6C_ zi7Do$rl!V*iJ;vMNye7RNuUOMQmV0OqD7j8v890}xM1U}TAPuWmy(l;RBRYoCMFps zrKOpeo2Htknk5>iB&He}CYqWWn5CIn8YY^UTUsO;8X6}hT9~Dn8dzGGrCJynfT{(9 zL_>q5l+;8^L*rzlRC6O!vlIifB%>ryU?f?j8k(9LCR!SpCL5(#n3yCQB^nwhn;DxL zgYtl(feEM_2bFT5VuSJU>WtLH6r^e(ITchtrkEKRnwgjzrGa``$tmV3DFzm4#wn>5 zX%=Q_1_lPEsU}IOmZ?TbriKQVhL&ldYTCfq%s9;w)EqQQO*J<$H%m58GBGeUHcB%9 zl_Hj@M&_voDV9bChDl~ADdtHgmZnKY7G~yYmWjqmDHf(lpk5ZZmB!1l3cMK|p0+^C z#X;>&ixgu}(Q0UsmTGKlYG7e(VQOS%WNBt$Xl`nfW@ciUmS|y~YLaAZYHDhlXbD=s zo??+~WMGtH0?Mq0X{IJghRG>rpuV9QsC|-RZeX04nv#^9Xl`t2W@KRsGR@LF#UL@s z0#pYi8Kx$hq?&?)N|0qEQa1om`WvKLrlp#u7+NG+ni!fJC8mN}?*^$Bpxk9*YGG+< zm|~CyYS$VYTBIZ;B_$;%n$8m3wpC#RaG8K;?ABqbRnrKA}onwlgU zq!}8fCRrpI7^WGSnpv8eo28@~7=aeWYG7uR1lmVnkOXRHnp=P} zOIoU-iGhWgg{4Irs1QyxPfoE+P6ZW#iKd|NGcq$ZO)@q&NlG;~PEIs8N=h>|Nj0@h zG)+l0wlGdIH%?0hg&J?gHn7W*6LWHOGct=y@{20r(Q1;IYH5+2YM5xAYH4U>U}_B7 zK>(^mKqDTY9Rr3Y2F8hIrUnLS#ukYt$rgs@DJI5-=EfEVCdrn`M#h#VNhY8zMTy4A z7D>q|X{iS0$p$IODHbVa#ztw$MybZ8hKa_e7KuiNMi!>X>OcinPg~aWRhf_m}YL8 zXlZC*lw@I&Xp&-SkeFtil4NLLnrvchW|U%SlwzKin3$B7W&rBxrzIz*C7L7}nI$`Bqb%qFwHVK&A>7>H8si5z``WiA|=f*&CtRU6n-q45T~IvIV_S>EzOeC z(hN;Zk}OO?{i9S+|2oAY#lj@X*vQDh*w82~#Te9}NK8pfOtwriH8L?tHM2;xv`n=~ zF#v6*GB+_zHcT-!H%T% zk_=4KOj6TK6V1T&I%B|AaHt{W3V6^N8JHQE7+ZpdVNy*jQ!Px5l9JNQjEq5LcA6z< zD8$mt&@{=yJUQ9i)GRsK)ZEg@%-Gbxz{n^Syl2GN+|tn8EHOFFBE`tW%s3HL6D1m@ znuFQ_DVC`QCPs-Si6)8W21ZGippJO5S(-(fNoul@af)%W0l1mVAH5FjK9pevW6NYi zQww9GBx5s6P`M5YaDx<+WQ#hQDho5yWD65RqZC8SG(!_} zgJe_7L^Csk6r+?>qom|yBa^h0WV2KgizExf6cZzZ6a!0(G{e-SL`!gNGKH@P1r%DJ z-N4k`B+bCY$ighe!q7N5ImI&3Fb%W=FvZZ!IMvA9zyQ>eGdD9%PBt)4wMiQNoGkY;9ef}jnvrFiX^Me~ znYn?XQK}Ir>06j4n4N}dLEzC`l z5{)d(6Ae;~Oe_*XZAAmiBy&S!gXFX{vouSCR1~zKFy5H z(o)RLEey<44J?e!Qj*P6(oD>fQ!LHXOpT1pK+aCHGzT@x3{p+aElrX^Z4^+dXD{1O zlv+}R-la26F*HvyPDwR4N=r*lH8r(JGch(d1SPCw(?la<%amke10w?q1It8c)vZ<-2NrslGiIye?mY^|5P_b`l zkz{UcXla~kmS|*=lwx9OY{M|oMM`62C6lT zj4e~s4ARU^Obm_8%`6R#EsZTrEsYY*Qj&~JKqG6$pbVU1Y6>bBjFJt_O%u%wER7PA zERs@_Qqv5~jZ6%TK%4N)K`jO2q~xSj3(G_UP+!I*$tW$+Ffqy8Bqhzj+yXq1%(HK6 zQGRJ&if&PUQf40N7%6Cw%-F;Ll;6xPEG^9w4HAuwQ&Unv8PC+r(!|Kn#2hpXX=rX> zYL=7=%3G%@1?KB%`Dx(-ey| z%cK+olVlT9BhysN6blOzV?(19BZEX^O9L|#<0Rv>L<=*6G{dCiv?McAbF(B+4@i!^iz$_&($-*GT#1PbzH?XiUHndE%Otl0LI$D}1r6i}AnS;8=rUr(_ zpq7#uq}|Q^Vr6MbCSv%-B-zl?EHTX_(bUv5E!Et}#4_2)+$ho96x3@qG%-s{HZ(Ie zO-(a0N;XP1HZx2#O-VK}O#+oK7M5m-CTRwVhM=Kq)5NqCGmF#|gOp@56ANQAP=Fby zni`~}nVA_GnWUr`nItDAC8e61Cz%?UTACOdn56VQ64tX>4SgW|?G>VwPrVW|nMeY-j-L z6{Q#(SQ;3cCntdd&CtX$G0`A3#mw9!DJ41C+z>Q}V4j?4Y?277@=VQ)63r76lPoRF zEQ}0H(hQP}K#ia?Usso>CS|4|!pbN)(ZbNo(md7F*ucmz+0x9^0#xM~rhrNwBlEGZTws0|QHAqeO$mWK(0%%s`qEsPzhpj+9g*P**cC4HO)yrm2aRrb(btpQI$? zG|<4GxrMoQcO+L42+D-Q%%xR zjEoEn64O!)jgpd*5|d0oql4zgrm4m$$;P1VvZkPHl4=gxyl!A*k!omZYLsSVWMP_^ z3@Ug{Kz-s=%M{aOP?2#~$Pm;<9mS&|Fd71*Aut*OR1X0T(1epNsG=<1f#pyLu*BBH zs?wrV-IUa_{DNX#&?ywUi3OR9k}Z~i4zXB~oROcMnUYwvBqcK~Z5iaWjOD4tNuV=Y zmO;***aD$+3vx=+GxKzdQqxl_3f8A37MJK&3-jMrzT{ z-2A-!KrwvW@4E2n`mKf?8FN-q)9hU>53_v^!Jp+)Wfu4yaNV9>SkvWJDc99Xp zY=dQSrg|nISwoPOAorTuGt#pFTWFzY1oE;WNU;$} zu_eS4#vs2Lg7g^bnOf)>K|Et*2$HqXGXz;^333L+FA!%KUMX^!xCE5EmfP7Hn&=st zBLz78Opl)B(9>G36uA;O)59z!#n3RxBGJs;!X()s(ahW^)zres*bvlwH?}mk0JX3a zQw%H(Km#WxX356psmZ36W@%=|$)KUEBy$rpBTIv%R7>*|3qvEzv?Rl{G~?t%1Iy&( zL?ct96f<)}14F}PgH(ewV-sVOL?g45L^BhUl+=_olN2-4)U%9lb=N>#3pr876?CFU za$0h7im_Qrs&TTB5oqQ*)zUoGA~ng#$Sf(v!Z_J9#WFR;#3(H-2{g$9T2Ek_W@(X} zVwjd_1hUG+(7@E#Jk`=H&D_|+GAYG8Imyg4HQ7AP)HKP`#MsivEX6F@EX^Rr)W|pu zbiRkT z=E>&f=4O^A7G{>hUi zlAH>f#kaID0`;bok_`-v(^4%G4U!X0z++rFA9p~UR#}jlmtO3dS6q^qlapEmb)u26 zsfDR&lDV+~Xc3IDahgSHvW11Iak8OtlCi0gxtWUBqgVrq@@~Knt+eINd(PW8>N{h85^g74$ZMlGE4#wt1@!0hd2r) zMh#LdQj);_0(C|b4Gk01QVmiKO_P$-Qj${4l2X$wjVw$pO_ME+6O)aN5>pJ)%#AHA zjEqx~k`0oLQ_M_~O^pnblg!gBlR@1KV`C#jV}n$aloSJF17lDhFxfCI#n8k&CCS*_ z05n=)U|?#LXl`kqW@u_`2wu{|D6kFLWjUEiMTtd~(4ez02Tge!T9_oK7^fy08ylFJ zrly!!rY0GfT7srR%`A;fjgn0gjf~9=%neOV4O1R9jbI0Y&OrlLIZ(G5nI;>WnVTo2rllGfCWGcT3@wb!LCalIEG!L-lTr=AW8=w5 zrWWRD7Ks+ghN*@rX@;P2k`xPbGh@&i03%b2G|)_|ak8PMfn{=HYMP3(GBw41IfEW8P zN`S+!9JKtxy)>~X1sZ-S=9Y<|ZnTB5MQUsV40~CD8#rlXvEWWA5#fj;u#d_(f zd8tK-C8;16=jVaS=OjyuWJ}QWqp7iBs$r^$iCJn=Qj$@MWtzE(v8kbHl98E(1!#sN z(I^cR5C$fODW;~D7UpS2pvh)4Bhb1QgX9!*(1BJ)N#I2xuA@~Ro)>XcOCTx|g=bJIZ6_7;|DhK80# z2FXUL7T~pRW~nA=N#@3e=E)W&pjyo&)zBo(DA^daKFz>1%`_!BG1b5_&CD>>FwMZ! zG|k-9+%PpQ+0e*1)yOc($ig()%+SKr&?3#q&>$@>(K0E;($vBv(a_k;B*iq*FwxQ? z#R8Oz&M~mME`zu_mB_G8G&MCaGDd@Pc%<41Em~ONLaI)?}oTKt%$g=Ha1R7vP?8d zHcmE6F*Y$XFiuNKGfFiuOH4ING)XbDOi4;MG)qY}vIH$%FfmUtPfG=@i!v}U2dzd- zOg2qQHUTZ?Fb6e#3`{Ld&CL_jjLi}gjSNi8jf^Y}Q;ZD_EsRrAO_NQMjEqyvO^l5V z%?y$gO+gEEQ=qQ)4}-WmvxGQTC#Hawt|pnAq^6~rn;V-Mnx&c;B%2teCK{NTo0=yk z85@|G8i1<&)RaWfd`q$^Xho_;s$r^ST9UbmfoV#zS&EUVxurp3iixp-u@PvkkGUbJ zagb)5k_;NePc*kMH#D;_Fg7qXNHIz@Pc=?8HZ@PPNHPbnZ#&1pYIq#t>a0ZKTy1P_ zVQ7$&Y;Is=Y-(VXW^SC8Y-(a;Y-VbnXbf6;VQ6lUY?5r8Vs4RaU~HHMT0#t3tYVs& zm}X#+Xl!U?YGRlIT2+;jWMXD!o|K%HW&s)}H8wIaOHDJhOf^b1G&4_3vjETiS|p|< zT9}xF>KahllVlEB{CSRn^_C;V)!F&Px!TOg*c7y$(ZUEcf^G>KOE*churx_CH8e{y zPfAS!wMNa2l8uwoK-1*OpoW4)im@qZ366=0kwub;NlIdpk(p6)s*$0EMM`3#WpYY# zilIRYXt}6?scDL-VM>yDnu%GGDQNAb5$GJrL_<>}&`Qb_b4VMH)ju5K>Vh2NTy0{U zVrrQRUdfhfnq+R6nqp#ZZe*HhmYSLjS~ZuFlwxdTn3@P0I<-tnNi{SxFtPw0l4)#` znr3L4Y-kE z2AV5M0!`?iWn6NOfz^KPO>IzlT~MN%L}Z3EG%z(tN&?j^#%87_W)`3+GDAzF)TEST z%S6M(G$ZpALvssb6HDVnOJma{3o~O*k_`+E3@i;zK`AB4478RY(b6Clv?k6H zH1Cvbo(x()nPO>~mI#^@FikN6&*&v48Yfv=7^j#TS(+Q0nwy#?8=Iyi8X6cU8CY1F z8YNmLTUaC-SQ@8-hNMkQO+YLE(hO3-^M2DbiHT_z2B1a0rl}Um zhM)y@21ynvhAF8QW@c%YMrojO%`Dl-($EOh1Oink#+F7&p!Fn4i76(A=Ahyy(J(c| z)Bv=~E-@uJH8I5ilzc1_jm(UVlTD#zAWK&V+~FnV#5vs1*aEcD+89*vSsEl886~F~ zC8k)IfaWJslg$lNLH#b%G^6BXL$k!Bq+}yAi)7F`HFHz&0xQcDPy^M-+!VCVH`O#H z&DaPu{hyR#nw*rD44SJ2Z9TCxOExnzvq(!bGc-uCFf&X^Ni;G~GBdUS_sh;PuvAH) zoS6w~Eg4&yrKKfXBqtkLCR(I{X19{lOw1FFO%n}`jT0@+%*@P_6G4-1iNk~XmH^I-sSqrbb4lsfK2zhN)%-2C1fL$tfnFwa%b@BcK(2Nswjm zj#Ci(ctCElOfoPsGcz(Xw=}d&GEPe}FitZvPcpDbHZTP(H?l}J1g)_&G`2K1G&D3f zH?^>|NH$GO1WgO2CK(%pI)+K6NhWCq7G|JncTii}GR@fB&>+z=4b%=ZGBvUUm91&U zCKg7Z=8%PjK_Y14GtJyGIW-v^UffcvgI%3NgFHhb^>R}{t};zDHZn*`PBBVMH8KJv zBQtYLOA|9=i)7IH>SO~8^JF8Fl(ZBB^E4wf14GcpjuZ&YWyvm}qWh4hjR)G(+{Y?Xr5x4Xkc!ZmS$;Unwny6kZf*{W^8C=VrXCi>R~5= zW*(DL(u@q#3_uGuKzkDm&5R99%~DMbL6!em=AGN&&Pq+rFG?(dEt3YhFfGy8C^^|Y z71RnfO-f8OHcvK4HMRuTp`bNPCdme%B?KuJsTQdzW~mm*CZMCGQ&Y{%(~>~zA50UC z%t8BWEG#W7l2Q^)EKH12j8iQwQ&SC7jEzD2Tr3StLHl0JjV;pBjEoFZ%|IhX$tk9$ zsYa%0;MJ?fiTkj)Fef!VF&Q!&3vy_ZWin_{Y)XoyF{lG;VVVruJCI~xnw*kkWMQ0W znhcusO*FDdNlvu@O{ZH}8m5|qHi#srfmY&}r-Ijao0=sVnN|8BwHG!CK?zTm?Wi`r5b^P*T~q|#L&>pz%(T(#lQm8 zIRUl(OpT2#Q;jT*j1rR*jm=XMQC|E) z14C22kk z#%W0=7Aa=NmdU2ZmWjz}DHdr-mKGL9Mn*}=N#H_9WG8s65me~F9a@wMk8#r!1H+_5 zqhw3N)Rd$Y&=N1u>Oy1FWMj}EnX#pDVq%hca*Bm{YEl|#)rFZsnng;gfhlMqq_L%u zrKy2os!>WJXyi1-A~D50#n1$_#mLOe(j*PES}G~o+%(Yy``#WXc3#Vpw%IW-BiWdyVi+|bZ6(bU`|$uKcFF)h_7(ZB%IBT7t7 zOicx?P_ZyHG%+zZNJ<2)<}$TNv@|m`Nl8jEOG`9O2Ipy(O?%N?2OUv??kWUDG-$LI zv{u`|($K&#Da9PLHPJjdDLE<4)X>;45wuIoBH0WyF_31IWCB_$mI4||Of@kxH#0Cu zNi#GuHZxC5HZ`-bFfcGkOiW8QPBbt{H88VGOEtDgG)n;uN0_9TnkSnk8yhBp){`e0 zm>F7HniwaV85)6$an5Ud(AW1q?nl*B^!cv z_?n~{gGNF@>-;TKjV+AK5>3-gEzB*_Kvi_Ak!g~7a+*n!5eOL?nV6X*rkGkJSsECp zKsN&OM8b<8Xp#gk9E4{ZLvzr&U`tDbRM7etLrZf*OCyU^^CW|0&^Q8U-ymrFY@(rA ziiweNVrpuNfhA~%oS{iFs2H_O0+q<-hNhtHUP&fq2A~?x%-Gz((%d51!qhm)+`!y8 z#Ujbn05pkYmYisuWMph+XpoqgXl7}cl4b&4J}wf29+E|=X`mtq?n;xyWJ6O6Df!hNc!NpeBu>v2jvbB4}rWNur@8XsKXoVv@0C zq9JGjFKGRtVVXg5Vp39S3TS9EEiKK$(#Q2GX=HQO$>~TEsczfERD>Q%|K)2 zpaq1IX1mbhySOqp3A$w%ly@vFjli4UEG;bzEs~OqEDcgE4M3awERswu6U~zhQjI`` zjVWkI)hN|0#XQl_(jeK;z%T_=AsJYvni!>67$v5er&$;!87HQuff}907D*<_Y39Zz z=0=tV$%#gWDduJ=CZLY38EAIRD9Oyw479W~*#ukyv3cE8!S2fP)SR5`y!>)Rp>C0w zW@(yc4w}3J?bnWUwpfI5YVsi2BCH7NzOXEVvv(!$Kt!pPFV zG|9vw*(@a`IoTo=RF)YUm>XK8m>VUT7#bQRB^o9sB^w!=Sb%o4rX_*KDveAG(~?sX zEi6q_Q;aQ4Oq0R0Gg`NADx$d8OfRvhD6vv6GcP%(GzF2D%uLKp%}tCA3{%a_l2THW zlPoPvlE4#HNoGlj#)hCh>xo7wNuYs@RFfo7gT~k-$4U&z(1L(~2Q0quDy|mIC$dWox3Qaal0nG?lB$`;7Bqk-N85yS~ z8=IM?BpaC<8k?r28YP*TSQ?q6fp)GZrX?At7?^`rqZ=n1Cz@C!8z!YBCK(tcrKT7s zT7Y)aTO=i!ni?A!rhpdKnHi_0q#9U)4ks{6Ni$ALG)n{R_cb#yHn&JMvoK0D26s)* zGCxFjVrE_m!ik_W1=5m@(~?2!qs>fGQ_YM(qxPVlQA(P*fq|u2YMN1+iD8xAkEm!Bq=csyoJlqAj!-C6!zw3X%4I_(W&=|0hSqf+f6f_yr;EuN;Xb#LEH5rsNK)Z#_lMRhQzD!I^1a(nBWfF4^YHBoxr$!Tl zlr+oKq*T)+QwvMbepi!J&^ZcbsYYqwu{A@ZG;?#a#3bXC_H&K|5(d_w;~vdRZ8lnf{u|WE0Q~xfv+)q$HYv`p}jpW~Pa0#s)?fCMk)au1Kn35@@(B(KyM> zC@~GxdoV~g1MMU+1#JXKO0%#uF|{;JGc-s`23I}oq3BLT$uMSSMuw?|#>t7sX2~WN zpjj&;17piXb8~Y`3p3D)Vars*G*B})ITbYKla`!f1X|Ud3>qafH8eE@1-_Y~C8$Se zYGG=e0y-cf)dVy-m1vo0W|@|pl$>ah2oeD8dIybx7=kWAF$E1L8YEeOors=c%=J(+ zOtOg~Xr{mfbaI4&ajKDVim|b2N?KY2Faj- zYfFxPAjRC=0GAO;In44LE zI+JOpmL{N?7SN1tig8L(qGejDkvZsEDFg7GQkG_*o(p)b0%y}r1+;8koRL_Rnv$EE zn-AR;26C&ZiHT8~kzsNwXz7Z%A!u_M=!zS&Bm>a!Ns5tiikYQ>v6%^I>r=8(N{YE* zqCt{TN|Lb=Xaj+HX=rKz+U%BMWSnMhWS(Sb zkY;IQVhAe5jZ#fhK!a2!W{F_8$}ph^XmLqVW?nixdxJ^NHL)-QHLxuVQw+^PRflm(ssU&|+sr7@!X(8!71Un`9qEy1YG!0) zkYZtwmIUhdn46_0rX{B)r==vOS(+r8fesh2G&D#~F$QgYF$3-J2Umrh%IL);Xjm@= zTz^CMCxU_#wARBkDaAMiG^c3*n$b%J?P5+!H83aQ!Oo$K$F&qX_lbTY|!Fq)1)Lr zP|0cx+WKh-?unmey?;{)CF(68BO2+DQD>z7PYP&-kXcF^Xb3+k)x^@s%rG@64Rl+P zQ8H+$fRUMnp+TClQL06f31|_BMG~k;wn#KFH8M#uH?lAT4V$MLr=%HMq$ZiABpVv1 z7=T7>EKJjk&B1q)B_$@MrC20_W-m<4&C@I)jW=@(BO}vf$l7kMShO|~)U_DBAY(HV zaH}0O3;{Z^BFQ2((J;l#*u=~jwAeh^(!|`vC^ZqZM93)3+%ye5I|ynQo1_`0BpaH6 zRvQ^5nk5;7#)LqtL<~R!`vz$iNogjA=81{P21XWXpjI7dL4dhMvazYLVKQWm3}~GT zIHhu|Lal);;7Qan(GWBsoRn&jWSEp}X_*4*@_^3eF-kE@F-b~FGY4%FP62H-NC6#v zWS*L4WNKh+VrXJu1lsOto@8WVVV-CS%HiM@L>88*sh|O9&|XW+WV2+$q%^Z6OVF0g zWP`M1BLhnd12c2WB+#Igg^@A1>|~KdE#56q+e0bFNoHxr#-JW;npvWOfiY+#+%&}` z)yyo_$kNaPv@y&e&BzcmDFZr(0JMb6*aTFdrY5JF8JMRenH#29SeSxV*(4?zS)_ta zdjf6qOinUMH8C{-RT!p5ptBN;&C^U$OidD#4Gci()-ufiw5u9ag|l#@I}xRLH%+rJ zuuKN+l{7X?F*iy!G)py2Ni{b}G&N7LOft8$Oa=}4C8dDown4||m|0jDr=)<+f=M(p zOEONjFfq0;G&eCd0&TxYP67@4B^srrSsGdzn_DC&gC?^;L$IcnMkyA?#>OV*W+sVg zsTL`Qi6+UAWpPW+axX*epIPXk_jExmThO4Lg^{79VVXs_jCaK`D6~jc(`Ww(DzC>ft5K|gxBWqHsp`}GKs6UsIl4J>* znlLsuH#AH!Gz2Y5OiD6K1Z^BjGByMa>40XL&ax_@mYEiMkma=S1PL1JF;4^SB~LLo zH8V_0H83zvNlQsHFfua%9g<{_l459{YMx>M8bmQjwloHbCK_8L8ySNZU8I_&Stc1K zTYv_4P0b8V3{#9OO~9vCrGZx4m?fJSn;4myn53FpT9_oJnS;*aFi%NNGDu4{Hcd2u zY;$B;iP{~vgfuPTZZtAWF)|08-2v*Km>3usCxeb{0JVV3K-QEs{)9Q;p3{LGu+xiRMP&fi@l!)GTd@a9xU-VWO!)nrVuuX|jP~nu(=> zg^9UQYKmd9ajF5Rhi8-sI$|uvG9}Hz)DU#2levMVk*O)Ts|(s`30l5p4w`&QOaUE4 zW^R}aS`!Hx;Y|UxiA|CXK*x|-m>XCar5RbIC8Z{%B&LGqS<@1YjlrWsEF7r$#S%43 zgPQyn21bU)X=#?A1f6UI8o*03Gy$z_urRYUv;_4dO%2VGO_EGfOhDWI&CHY1%*-uP zlTASl4$y)-gEV6UQ0c{;OOG^XY z?U$HlZed_)3OeJ*BFWSw$si>;(cC;S#W=+hlts-!JE_eiXkuZJW^R&bYGQ1ZW&%1g19Cwj>qQKQq7DrinHrcSo2P)R zurxPGg@okPB9yYn$N*mUn4}q{n5BVsSErg=m?Rk(n5U&!CYl<8Ha{jNrzKmaTAHR9 znHnWofbNM+OR_YuFb1EgWsqo;l9FNo8jnl1G%_(VO-(aNN;I?ttzkE@1Rc>}mXr({ z!7xZPurN$APBt?KtsOQuNd^@KNoGdo7AcmHAzzj*l(GlpI^+(mWl|!j7yWnYl%pA?TDk^Hehwn(Kq&^)>`609 zOa`3-r2=9Y$r$w?`uW~Qm2?nSD(rLkpNnx&bkiLr%=3FsuCG*i%` zEl?9bDcK^~#5B#o(mdJN%s9yeoHjWpqYm+d0u)l)U=H!88d!q1AQ+gZfKHQ5G&eIe zH!?^A_4mw7Oh8Ajn1Q+lMya3!Y?2Kulaox+EYebpKz(S?DW!%6pq2WD#-Nr7=!{u& zLj%jyG&A!Q6GLNj1JFJSGXu~`E9S;&$)J_=pnJPbLC4D_85o&bnk9kTMsObkqt z4U-K)2L&3Kr==#Pn3#i>oEn*dj=oJcP6CZ%nkQSD7$%z-q@|=KrT8pgIGTSW_*` z%s}T{nSd6CgN~^+GD|W~NdX;9nQWPCmX@4ol4N0EVQ6Y@Ze|QV`NP~0w2{at+0qEK zLJV|}g@Kv5QIdtFp&_VnFf#<5)dSj&V`^q@VQy+-X#vhbXw69@L-g`8#RznUtO01r zi79B}EzQ(0F*(iLz!Wq&kZ7C+s-4q7jlUH0#5B;fLSmYU5$NEuM6*;2V?)sD#8l8h zqoBG0bR2;}3g~P*W6+tNpjjz1P_x+(G6i{d1+$6~&*)%N?baYy(Not~{1!yz9k!hldS)wUuZCjcl=xDGcV}le6 z(8@1EP|h(+O9AH`j`gV7+fWZJdz&X(q?s6+8XBggm?b7AnSrJlQ&W~hlg*7SjMLJL4NMKw49t^2`;`*Y%uEf;EG!KzO_CBVO-w96XS126 z7$lm5PWnhSN=h?IHc2tJFfueWG)PS{0JTy{*zYC8s2tSr{i;7+R*7n5I~mn;IJ%8>J?iBqf;{8ylqc-V)>2BjZsWQ5j_H826?V$g0G3*#ivDLod6re+qYNfwqV zW~s@bLmpF74M3~$l1L6TxkZv=qbCv=mbd3llTYLUBt=O9Nx$ zw8WGoP*=#V> z4RnA`vOyB)REZ?hRHHP@lr+$3l;&y4=AfffKm&TFiIx@?W(LNfWgMU?*v!HrEiu{9 z5Oe^hA!MT!i!OQyg3s83yV1zN%rG@M*%)+gqk(~;xw&OplBJokp{0?jNwNj#sJKK^ z6BAs-PB*MyQ2ja*|=1p|N2SsLf|)W&v*d zfzIOv&Gvydq9i378i00K7#mrdg3i1#F*Z(21ucU}HZ`^|0{0R?rvzK1nj4y=rkYqL z8-td1nj2Y|n}Ci7HUu5RVUd`eYG4W4>yn(93L5?gEj>*(FfcYU1y6XR7mh}#g(K+r zG(*sQwmGP8V3K5L20ByCCKUejR>p!3paNyu6eCkJGmFHeq!h!%RHLM1Q_w+sW`-t4iD}?Qnt^3XD(Emo6EhQ2 zgEa7nh3r$*V#f%*uWgWGnQ8$#NY2DGDaFJ%IR&)1)zmV@DAmlsGS$%BBE=xd#L~jV z$impnBFzA__9MyEI3+m=l+r;<$Bj*rEz=APOhC)9L90~FEWpcQ&CJux!3PhTn^_nb z8K;;eStNl@cLVJmOG->JNCY*14Iu}{vxuQP5`FXxv^3Kw$;c=b)Q>SYO)*LZoq=bN zXklssYNH#cq=5#%lGBn+%*{cE44YY|nHm}x8yh92CV|ddPBSzzOiM{kO-?j3Hvt`z zYXR!CnSgeSnSk=2shL@tg@uWwnXxfwXcM#wFf}RB#K;JwDGgi`vPz&k60HDFwE(SD zGfqiM1TE9Cv;>_l1zNdmY?fkdk(2~lYHE^X2|jB)#W>L@Db*k;IVmM6Ej7);%mg&F zXpoeWY--HFz`$c*nq&^%n`ddBYGPrT3|b79m|_H4<6v$CT6GCJ9?sOz$OIG>#-Ouu zEe%0SmLaJ!1~qdVqZN-ymIkJvb%sfnW{D|j1_q$xxlKR~9`h74vn10rQ%g|4A_cTl zAjvX0*}}*)HN_+?8I&dxO)X6lEzOb>K~? z85pG{n}UuQ1+7c~P2d=V1}05GyAVK`doC-=!apNptPB5AK&Q*48K!_wI0j7zf!30O zb_ST4S{fK78Cn`yCZ?Ghg4Tg1rKF^$nu1P6H?T}L0-d;>3R+1II_KWP*b=mcQ$ zz{1$n(9Foh(jvtq(FC;47c_xpY6d#_*90_4V3-QJG{D&0Fey0&QX?|QqL$;v@G>&Z zz!0?jH_5`#FwNXJ$bI`Un1G5y+GJDYZTP8+{ zsm4i`;6p?c4U$vLl0X}El0b(A8YY=rrhqndg06uuNKH0MGBryvO*1e7?Py5@?T|1w z0Ie=EOiKlAeFqK0rx{r$rX-msTAG0?Li94y7`2Q9^;AraQcOW(BFUf=pOVc%2NwvJ=$Op3RMSL5b5j!wLo;&|6XP_?G*gpQ69W?q&|L|TgO<3}Q05Yi zOduHsZOKKVk+GqX5oj@5Vxn2Hk%4has*!23xkaj>A*cyxnP`>-I&|1F$=ndM0?X7a zHQ5L>Z*69oYG7=h0$OxoX`XCpYG4LxIT(QU6@Z4AlMO)SH)x{D#5670&>{)6<{UJ_ zlxm!snrf10U}}(TVqszm9+c!#L(MiO*s_gznwf>UrKyFfS(-WMSg}-d^AuA{3kzd| zR0Hs4u*6gYV@ngzaiyTOY9^-O%Evr4)hxxr$kZUwB-O~$(kR8)Fv-Nk+%PTK%)-*r z(%90_(gL)}477$lCC$v#*d#H{!Xzmr#RzmZuc>8nVp6hcvW2-NxY}V^h?;Fo;MvA9 z)eO`uFiHfSr;q~LXP#=3nw*@NXkr8!RWdNLG_e4!N-(l82K6jJXNf19o0}V2B&8Up zfEo&*Vl&kkbZoe(kpXCa(JTd2j)ATzurvXk9F_ta3bZgXH35~OpglDPCaH;ui6-EK zDj}{*N6j`SsM#jf%)}hDAj;gr%-A9^B?+`r%iPjD6|`&IB+bCoz$C>Gw4%r;G1<~2 z&DhWa)FMa)^+k=%K~oDBhGxm200ga#uuKGH8nZ-86VTR7^Hk6oT}B3JpowG9a2M!E zHv=OR<3!8Eg2M)y%>eRHK8JNEuj|gHKpAG&D^GFDys|EinU~5ucW9ZjhQ{VVneN?Iar| zTcm(C0b5w4rWu3IZcQ{vG6u~t7#JF*878MC8-UV+DY(19as;)zV1m)}GEM?*I|SXB zVrl|fMF`r%on&TVVqu(Ol9~$Y#~3GCg64}7O^iStD+9x1ON&$k3s7S`%_7w(Ej7gw zbTvtmL0XzcvMFe*dYXZ;S!zm(nYo3jsb!Kul7+EpnhEGG4bWg_8t5!l0}~@Nb7Mo3 zG;?sKVRb_fO0?F6v1yXAskxyAX!6V=#UeQ|33M`>L0Tec^-dCYA;%hDOPTmZqkLmc|CjCPt=-p!J&uX2#};mWJkrDWDS? zK)amHK_yy}rJ)7r1_T4p3WLPNBtz2_%fvLZlw>n=&_U)Vrr-`Y_dWCgMQaJAfDUy| zH3CIgYO0x~IcQceIXN}O$UMn31=J5s1fQy62-@tQW}IwcZfuff25uP{np&6`gN6%D z5-mViexxOtCM72tn4~6yZu&4Z0Bwh|Fg3LR4H;M%CL0-oN>5X>L<3NvYhjcOTEhZa zjmXlBT2x})T3}|8XknU~lx%94l$LC0V3C+?W|{;#Z8OO%#SnBHhCynY1*rXN2s%;H z+#ne=En)`RA8u#?8i_InP1GfUZsbWZ01cv<7$t)WNwY-IJeffX=x|X`;RN30VU%iV z09qCd+B{{RmIj&*0w+(t|ENW!DZHpm1~nf{%nU6OjnhE;$5RbK6*N3)56%&~e$8po+=Dz%a?cBrVa@Ffqy8EZHnI4Ya%t)QmDSG&Tb7jRb8x z2Ook9S~QZDWDd&N7UpSbW|p9%Of3zP&5~1~>CzlEi<|1D<>V)p7$TOQrleUIfclr9 zEmf%o<`#yD#-N*X3_w#Rpp`)8mPVlV7U*sRBg-_Hohc65qmi1LWCB`?mjYhwW@4TQIxED~JT2M6+{g@cYlwkmlBGpj zqPdY#QfjKHfiY+yd74=&D6@kWUx6kxLF@QT%+pehOw5eT63sxznHVJ}8iC@;(A2^R zTn`$iftIjZ7^bCxn`-FoAXC(KP@0*sfq818L5d0JFiZ<`Q*$$83(#S+po6T9(vm@o z{y?V>TNtG#TNs1-*kvKU}>D1 zm<&4A*)Y}E+$hBi9O+3$NvW1*7N(#PAJCY*1!&!x1!#oI!~$GT8yK4=r6ihJS|*v8 zSePV(rrj-4P0S2HXLFl_j|xsSGc+(Y0xg?LNl8mGH8DvB&5D4gFw#KhOj{(UCMTtt zq=GYy;$HM5iM}Gl*u=up1aywPkx^Q5l3}8md16|k8EB{%bcQi#k}WO8A|=r>CCLbM zSW=Q&`nKg;O(FwFB*Xc-%>$S02WD>mY~y&(=04gLHlh% zXHOd$gNLZjF))Y6AUO_E-WZsH&S^F_GqwP20W(fZOiKbCN?~CPI?2Z@)d+lGLy}3F zp^2%Xfk~QyS(>F8=)$Sg6k}6EV`CH0+)lEAQ8MW0ZBug#vlJuHX}4)c24-o77G{Zt zDJE&45eyTPq$JRJQHh{CVbYQklTuBMEJ2IfK#|M*5UGoums(K*=`p}dZqRLSDTztu zmKNp)ph=cQ&>FO)lvI<{B!gto1!G1QW=1I{W`@RQW)`M~NoFP%hH0jjDaL6jp!t6W z!&EaP&>DP0P<*CZq<~I$O-W8Pv9wG!Fi%c2Oag7|1f8~?l9-xi0a_t!U|?uwmS}F7 zXp(9PT3HX-Rm^q+sS*Uc6U+X(BnyM26m#$fV$i^yk)^SPX_^t}7?c#y&K%IW$i|>O z!p0^Bpyg`Gpn)FaR5KF;^CaUWWAmicL=(%TL~t+5GR4$9HPO;I$soU`xTbQI6B&Q}CSy~z6Um>H)T7$$+IwhawTQj!u)(oB<*Qj-!*4UH^~EDaMu7yYFqS{hpZeWwMD;8tA-lgOnr-BNJoe z6ywBXBa^gL(4{K|X33zIlBIF7p< zC7BtgrkR)+fts@^Mn;KAhDM-%zA0!A9_S=C6HqQlNi+oQV6p@a?Sgh`TbP@J4jTY< za|{iWEGm~LFeHor&t(Rq=6QJr&^dNgO)6V)>?rsCj=!-ly(m|zEPH#rh-P_ zj7&hg)GbU54O2j;W0@FR8l+j6CMAQ)^<;C?RL~hsNy(sV$}E#pObkpdQ$UA)7?`J| zBw2vh&!re7ni-p!7=q>mjgpK(E91?Kk_^p22ahEtn;FCS+*jw6S?mNb|cnR0tTk$pqnm|43o`4OAHc?l0lb;B%7F;r+~66XlblrqETuZ zs8wigZjuNZP%{H9Vox@;uuKDO3NFH3qGV00m>BiHWI&NlGdx z)qsYoK`m;~1_e_C^F&a2VFuCz85dwdYNLUjT9TSukYALD*u@0u?-`q?7=y0L0PWZZ z4WxjMb_6Y=P5~8hmMNx*pq!Fy0y?8U4Yc>u*x1s*+yvAnG_g#vNH#MuNJ=y?GqX%H zu`oyj9Rd%U{Yf@THMcZ0FgG?eGy?5dOiW6&G)yrB?>aFzNKG|LG6Ib`fnq)MH`0(A z#F>=^sTj-i4U&wFlR@hb3{60%e^@4_T9|?2G9}H#z{DucA|)*uln#>;%@flMKzoVJ zl2a_qK$`_EEsQOa4N^fTh=T6HOi2Nc=_RIst`12tF*X66<8NtXXpv%>WNd0+kpkMY zYhni4pp|HDXknCWZe#{o(#b2f9o7VboFbc%UyN9mmIk_GE(J6^n`Dw`XkwOZnQUqT zy3@$S5;R$vnqp>@YGj&dkd~5|Vvz#sYA2hUCz*h%C}T@w17py^0S2HIUIyldW}t%* z(m->cpxd!bK)Ym&EI}Ph1CvxEBXjfAM9`38l9{o2N)o82W|n9G&g3db5Nj^VQ{z|s(OvMOkBD+x3@X<%S!WMZ0<1iJRm40ORM=-MOj*-<=9E!cuI6O@rkAgKVc zha?3wgPxpdo(x)#Xpm@>mXc^{X_1neYGG-fXqjkg3L3pIO-=!g`dXSAB%2$jfo@qa z0hJbM<|&CL#))a5D{DZD$dc2HQbD_xQ&LhalhO=8ClV%GfVPT)wqKfBn52P549q}V z$t_HiL9;Z;Cg65D^DB6ELImj`jeKy8R8kB%ToiVMCoK9+%nU3oEfPWFcNU38Nv5D{ zrcyxHyPBF9fDQ?cLk7tyX{Jd=DTbgsJkl&u4U!E^QcaV<6+3ehxUE@& zIK&g?x+D|OVot+EGw@+Y$%aNIX-O$5i5AIeX-TQ3sY#Y5pb0l)qa;hvm2@V?2C1o_ z3vrV{SFM6BXER7OPXculL8pHhg0|2Zo0}&ko2G#dJu^4>a;{-69bbp3(zr%X(^y?RdS-4siA>EY9i>SVav4S z$Sg_;NGvL;^vf^FOim2}b$nn>G)y)%HZlOM`2(%J0-c;|WSMAgWDHt^W^QV3YGMEi zPg6r9Q$sV0loX4UREtz|<1|A9<79KgB+H~k3xgy}OH1%|OQ5Z$CMiasvmQa0CZ~aJ zJnj{;hfX)Ok23`IIt{W#Gp!!MdqXv$K0R2ON4|G~KXg!#z zsWIp%YGWf4bIZh3)1)*rlVk(Xz)_l^S(0gzaayXGp#f+f!r0UpbU>>m=;j;HiPWG~ zVTPbX@KRFJKwA@xO$|X88(x#715BEjtj%h1`8u2LjzL_GcyY_qeRfC zy9wyvhqP3~G(#hU#6-~Iu@ocFiu^RtJ;Z4yDTxMVi7BA-KTSc?nyH|}bS({x%u`H3 zYmyC<%}mph58-9CYxpi6v+^fr$y|CR$T7(EcV%lT^brW6)Le z#zvL~7T|>umZ@pR;0xhXKx2qW;LUt#shgnl!B8qiucR34I1^LQE<5nXVbEsxBtt{c z;qPe%$!W%hmZ_js*Qp@m6D=%3E8amzE`qM_O)~|z4U$t+OhG3~f)0rV9r|LCY@TFb z2wLT5k^(x2DA6p*9CUwUati3iF4NScB+y#iB;!jvY($b8Q4AVeo$)yqF zc^atEa*lz~>Efp3jLe*r_=2MRH?G6{6~a8fF0N25uSi3w;up`iiz7HM;1OVC%x-aXz$B4|0}?NphM=GU$XBqeP1o3v=)og$1ZfWM*M%kqnxgH!w9!G`0k- zs!TJrut)>ltPMKF*Tg(2)zH|&05l^2x?~V^(6Ct|=&b!zlhichltcqVa|6&B3KpPq zGfhoX%u_*AA1O(xsb-*wB4hB>HmE}7 zpmWSj(ku)tKxZnOSfqjPDm6{EFaw?0ZfFeZG=VlgCYz)tni{8Af+m#HKwIpL%|ORM zrh>K)gGLuXO%}5x(87weG!xL}-NtF=$;qHQW!vY zT9_v$C4xEyDWE>vIR>T$xvNsrixMHH!hxJ+WC1#q)ig25#5C134RoxVCFpjpBuh}{ zG)prxH?uHKGd4{%u}n-cFitT|N(7zM0=j=I4RjTRVN#-*VIoM%$jHPJbmWIovSp%? zajIc*vbh2H7)1lK6wug~p}B#fsky18Iq0TB(1cu4lA$H!2*4Dx9f-5di{q0s67%v> zAtMJMCxT`@(m-WuikYc}g|Vr5iWzA89O!70R8s>Z^TZU;c7|k&loS&agJjS}o1kNR zEt8YXl8r4uOMom>L6d4JiD`)zDXB)FZnGI^7Tp9i?g>6L$I=p%Yb{dKKnE&YCMBjA z8-T9xurNxsFfs?%Oo?|_q~sxzn2~X!xdmt-#V7@IC8+`E=n`{NGxH?F6bsPg4Jd)9 zS|q1h7=U*Cm?S2pC8Zh|rA%}T7oXMGfGS~NJ~vhGB*LujDqf4Ha9m1%}XSw zB$|U-zQ&+6EkWoTxeoSbZI z0y@GX%`!C=bdH=EXwnXJ0=8j_0cegf)i5Q|EY%XUpBr@An6a6mfw7TMB4{Bu=$sSN zz)rnFv`9`)GXw3>Ha9UgGcZZD038ft4BGLZ3|e4sVw3`2Dq&<`2s-22)W8UIiG#U$ zYKld2nu(>ErMZPcGU$?R3(&B2nkDE!9#ccmLbucuaBrWPdDj}~1xE0oGPg7Z&3_sg z7^GT&wn`;}u0u^tO|(b_-FXOFznGMoYGh(yX`W8xd85o(E zo2GzHX$KwF0Xm*31#|$InT4sbp&4j`&CJvwG08Xyw6qhn$Q`tN!ZgXy)Y8y2IXTrF zG7>JrvmNFvP+t@>I0koNvVnzhnvt2MA!v;_Xp1yxLpW#|N1|D(iAky{sFtw=-4$yI zn$Soy2W`1XO#+=aZvk3YYG9BGx>!6V*&rn~(J(nV&D`A3GR+ut=zoftxq(4yvN5Qv zO9Nf1lbC31Xp&@LmTZ|~Y@BLrVQ6fU0`Bt(Gpx)gDJg)vDHXKx&&&{Xb*ceqJ{>fl zk!q5fYLsjNnm+~Qgyf`@w6vsT^W?;2V}rC5%VYy1gJc7X#MH!;RLf-0*`|r6hG~}O zrWW8`GNAGbbdZFJIcVvig$d|70kc%gBy%IsZgT_E#MC6C#Ke>&&_xR1p^$S7j5Us{ zK(2zUs0Zc7#56PGG|;8=sYxbjrY0s9#-O4(Eip9}bkw_9Vu~5)#53|0(q!@xW4w-h=7y$b;2RiHQ$PpkgBs69X(r~z$*C6R#;Jzp zrl8%|$tIxtdO>GtC4sh;nWTcYjTl>+fG!(KOa=|y(Ien>;A2QcXceM;d@; z=Zq{&%uPV&2PY*afj1JG7^IpfTY}EeHA*o`Og02vvTd1^0$Qh*Xk?s}Vg#D2HnU7L zNlQ+$G&BHhaZgP)FibH^HZ(L(wKO(PG)zoM2A#?TTEu7$T7VC_(ZI~i5_H&*MIz|< zW>6U+ynJ0|UU5NcGHhi5$YG#U96+};8Khbm7?~LuC4+Xeni?gg8k?FK8k;1gBqf`G zZqYO|0nIZT8YP>8R_TIPNhF$sj++AQAvFLE(-4O13aEO9eLx4MKJx9F`6_pCvT~p8P@g3#6E*SsJIM zn5Kd*5(afNjFUl&jX@Lh24-o-p!+}!lZ`A>O)Wu{IA~tn)Wp)<+``Z}G1W57BoTB| zt&y2Ys)f0^rKy22XvbSjy#k%b{BOP*t3 zu6npSH$SBmseNc*kqo-K%G40FrZveZEzQIbbQ*A)g+ZdRg(WCZ5>1kgk_^E|P9~We znWPw+nOa&VC0c?`o;5c~O9b6WYmf-?TasyNN}8n+=;#=eB(oF~v*c8RG$S(;(2c%n zrm4os$%%%b!{fotO3)g!M94DVw&^SKpx2awViUZpCl$1b%m8#;WQv7>c~X)AXf>Ic zfw4JwQDurHXiHP7VJc{mzD1IO1!%!SN~(oHDrm)0a&n@jfq@0+z}~cE&;~WoHLNMd zCdsKO7Uqed8@WtV3{xzPLFepR8iGzzGqeP4Z8Nj51P$(klG&mi%kvSr(L5>5FxkQq zG*@Mmnvx2drnWRmHZeA|G&3|bGfg&5G65w}gG8egvqU2!BjY4<6VP$6X31toiOHtP zW}v+lNyaHDhNfng7NBK(X-Srb=B8;D#^#_lxq*SHxe;jnxIwaosgaSfskvpckwKD? zagv2$ss-e59q)H2=c0oG%EHjV2zr!gDyR!%V#L6}z;9q~YzZ1DGfA^FOfxk!2VF{G z4w|@1G%z+b10CdIo?;BzJCFoAjLrmfnG|R*qp_h$s$r@{8tAB}G|)zn#8gwz1t#VO zpaW8qQ%yj-hEqUS#)B$#i!{UJR5KIE#!kVxD+>}!GT><)bS}Jwsi{$tA?P9(bF)-4 z(3wJ@3l37vQc_F|Q}XaLTRau?PY zq!y*2j|L=z?n?n(AeL$hYG{F0rJJRKRy={$My95wg3hovHAqV|26dW}QVf#K49$%} z(`|;yhDK(fvHK*mB+y+;CPtvUm@UnWKm#kFW6_O_QY}HpQiE1Vfi`!VnwzDVCmEX> zrkR-}CMTO27$zoy8>tD3YtXy2rfHyZ$P&~J1vT}|lMKy_Ku2Ggn5QM0nI#*7GI?5x zxsj16=yY9^M8jmmMB}7X1JEpNvVmnvTB3QHg=Ly4sOkcZXs4PPCmEW8?piTRO#*EI zG&VN_P1u7DasbtdmMNee^q>aOwNa%UI|KKCYHtqscFWE zrUr?opnDiB42_M<49vktQ6{G)Sz4wTf{y^WLz}VElG#PY-ftiI7X#2lK zvYC-Vk_Bi^&fLVn!o<)7bTN>LrA4BVr4gtnX=G$#l#*;_XarhNngqHy&Dg*^#n8+M z)R_k5MbV%Qg{7%Ql}HOkK~6JFwE%6xGO`5SlxJ>YY-pI6nq*;^3_4TT+yHblSYmP- zC_!1IS*9f#SX!i}nJ1YhT7nL7G6F5sF$EokWR_}_Xlh~vy0;?P%m{R&lZBaSs)=b@ zDrl{xv6)F)a$+)gZ;xS`c_OH;1fQf~1}V9uZ>=mW%}j=;{4^sAqr{X%(E1=#Q0_4{ z04;+79ph`6Xl|UGm|_Up`e%`nXbid_!NSA5cQ1_nlHNfw~d zYEUE@nOPc|B^sN7HcBOdZcYF>3)Fm0O-o5NO#^LPF--)m3pO-MGXO6*DftDy$37=B z4>Gj}3aeD}6hqM6C5eWH=7xzThRLZWrirPbVPXkY=V z!V}Fw_uGT+>Q1yw0!?3=m{@=gYO_c(F|q{p1wiY{j7<$v%`J?KL1(mswwtA-S*97L zfc9mZCW6kDHL^%bGX`~Q&xWV0EJ`gvbQn!742;bUL5G#6n3|gzC7Xek2BevSwo0af z?o2dH0X2w0_tPXAC#NJ^fX?p&t(i9j?Xfln9ZCW26`O%}gMp6!G)V#NNH9!JF)~X| zGEXx$van1`u>{?tl45LRZUSmgB_|pin1BxLGfIQRpNGPV;?zWV^qCr_nJ1@#4#>7J zHAw-DdM2fS_9dAb8e629rfn3D-TZW0`MhNfl)X`n;cjML0O-JvuS!xR&XWD{f4RM2^vW|p9<)>Bd}%`8%q zjV#j)lZ-)Qq)DKAHPS$1yT-|&^S+D{4MA5AC4tVbvj8uVFfs;B7=tdXG6PLG8W~zx zS|%l>8kky|C#6_|t~g3EFfj&iU^~gVy11k$6=_HUv;f`EEY%2fGEtIIqH!u{5qn~4 zvZbL(D(K=YBT!4 znv_p6PP0r+OtwrkH8wT0G_yzobvi84Qd5$WjEz%Lj8apLjgmoE6&M&L8G%*`nHX4@ z8-kAfNCj<-GD%LeG&KaTHs$)a5_It^JbhUjg1U~TiJ-mICMij2hN)>r#^y%mp!-D) z3=9oHr>=sovQITLO$DutNJ&gi2DOe2%#+NMQa}r=LHpLtK}S6sB!aGBPf9X02Aw1Z zT7PV4XbL)<+{iRF6|@J;z|7bLbT2_#Qc_wXXw`|S8K`(T$G|xK?dp=u+|(jO`v$bT z)yNcbs*nk&PiA72W|@|pmHw`v1D%VW zXl7;zI#bag*&K8Soe^kS!N34?D3)b%DroDONh)a3Cg?&LP@@%8DJnf)QBnfAdIMBO zq@)^w7Q3W@P82aUvor&Ba8gV_`!PVvgN)KZ=U|y9CMBDh8Gw3epuN`SMusNlW`>Cd zsi6C*KqnHKnwo)j!z39Qr5KwTm?eR3yfaF%0L_&en_4CsTcjnXnwpv!S%4N`S{SC7 zrkWV0rKW)vsDhlNe{Mx-5u$ttonQ^xacG{Fl4xv@1X_TYY6@C>VV06+VxDSdZVFl- zXl|LD3Od}u*dW;ebQ31%$iTGJ6q95#Lj%y^Y$k?AN#;h0Cg#SV>$gDriBdtGYs17u z&>2ynT~?s_(%8%tv@ggc5p-@1=pf+46!17#!hw~gC7B2}fev6w0hLb{hM;pdLF2Kh zMoAVaCZOAHEi6H^2B14fl0i4gBpW0d7=o(8)Kp7jv!ui{(-dRlG=r2>Gm|vX!jVK! z<1fY3FxeEe5dw5zpqW8ZVu~qf0g)-_WVtExP;JKtz|8Dg~Az#O!}542JsF)7g;bOg8&X!nRkvZYy) zfu*?-XgQ!!iiM$JBIt@FP_<(LI_@MX1$6gC3TUyCVOkRC{J%7_v?S2A0OqEqsfL!I zb#4ZR2B5nHK&PFVSSF>Jr=%Gt8yFfIfle4mGD-#w#z2l>zEQQZJh3%D@QJrZ5JLH-P%E$(G5M z#-O_bQch0kz{zKzDF~vR_sI$|}$uBe2Ou&=FXmae^e!eYeJG zpoP=srlz2470pf3%u_8aQjC*K%uSQbOp}ZZ6AeN4IU9pcIyNygPXsmdOjALJUxH3s z0<9*uFf>XsNj5PtG)*xE9sOluWC&{Xrx=1RcmR#R8-n%}CWBVdfENFnLMB*}B{o5( ziuFOYH1u3$P@)I*!hCWe;gi6)?%2F*a{i5r40^sz`aOinWgZNCBCr)dEiN;NVxH8eA|NCC}N zr-J4ljSMV77w#ISn5QIKf|6Hq8u%E8RO6JyRM0edN~%es1^600Bg<3^(4H8`x$~^z z8&mR%^`ZMz5NXa5bec?>p$Vu-0-BFbHcv}rU|i7Dn5rsk=jY2{>7 zBXc85<75lN6mw%sLnBKwOVG*eDVCNdNuV>Xl2bt|q|!k9j6lapfo_8`O*1k{HB7Rw zFaa&5OG`_#0Nr|Pk(8Q}Xl!DVWRzlL3>vpS%edssA&A4uGxLlQqvb})sb)q=pe1ZZ zCdr^9t}Tr~yP_;DO;b{hQw)+UL6BHLHaAN(H8nM{FalkH0XiNc zDb>Ohbn+CaqBTu6u{1DBvPc81+)YgZ-B+HHoS2rJ3|h0EYG`4Z0=g*B5VTc0DLFL} zw8-tup>3eD7u3DQj8ZdD{x?iXGE7S`GPAHWH%T;1OENPsNlQ&mPDxBQwFK=p0o|#U zn3!r{n3`+>Iu6#z2s9d&0@@Y`D#lHW(?I8!q$MUMrdU{7T7b^UHV2*TWnyRwIuyVt z%_1$yz#P=;00OG_&^Am0-ST5#44UV$Oa_H} zifKwpngQsLZ3}~>)HG8QBMVcDG-DIcmT%+K#3X}66VUOR=Ek7=0SrM`$$>5!PDukT zQU)!^HnK2EHZV6#F*h@_Og1%0vjiP01iHX3&BVymJk>nOEG@|#v>ziS(FAftJDbWD zsQWOA6eG|qj%liKqCrxc1?V=@Bn!}G9p=gAW}x9bgQUd7q*Tj9BXdi`H1pIXL(sw! z@C`Ab4wMP#lK4bZ1IyGz&?(u*M&@Z|X$EPjmY{uPmY}mEL2DjOERrnKlG6+qlhcw-EDVeiL03kBsxg_(>!HpoPlepl2P%kDEsTsoOFk@8jFJ%#in{@`q0HjPzu&q zF#sJ4lVp;V3c5zhD9PN=!qhOu(7@Cfv>@8pIMKqwJQZ|;ENHug1?a}Dq(oEDMl;Zs z2=K9shG{8@sVN3#hDm0ildh9N-NzL3Bm?slvt-aN&e5)F;b%`8DXAq*{& zk`v9+K)cC|Qj!hREYd(HpM$n|B_$gh8GvRq3_yFSQ!EV=O;bRZUL>X(fd^#HihKe) z&0HVVX`u7&K}!$PjLnlQ5<$13n1S+p8YtPD85x3(0J8+0Pn4DlIU7nNtVV&=1E4W$)J13j156I zx+Gf~fR;2Q8-bfCB2U+Yx`O(k>2gFP3e==D2MwGXgJz*k5>reKO-zkaz$Y)7fQCas zrz{(!8d`vMqk=9RO*T$UO)@q~v9vS;ch*6DXv-wiWJ}OKHA8dIIID%Bp=p{qXz#3v zxp9&SXgn>^0(A6^xnW|enWZu4(5}g^?*J zu_l|E7+Qi(U`jLqHB&%$#)FQtH%m@5N=-5|NV7~a2A%l=nnE-;u>f^nEe*^JEs{Z< zG852Q6^3aRmMJEX3scySZbf!#Qcgaij7|ZKcAHs%P8~Ee0}aT7Hf)0yNg1UY8lvtF$V9eNd!&Hrlx_W@l4H(Ele$pL3b8_4&XI5N(4;;Ct89I&b2U10#DApRwD~z3xhP!@^aACP6o*)pbPmxLu1Ct zpnJAJTft3JQc}%LEKNX%VSu(SnE6)X1avc~g#~D(zp-Irs;MbXbD=BYmsJT2D+o%($dh# zJQ-BB7$lj4u9`G3woC(^ePdv5mXrjl!BbL=K{r@}#tscrK@%jYiHSzw3!#%h#{q&4 zQZPP#W)Wow$TO>4Gqjq4M6*@L5BreSQ;g!B_6mQjJX$latbtEE7{wOwtT3O^hu;2P&qSn41`;Bqm#ePDBK+|42zRv@o;)U1*#N zI!G$jFfrK}v_-?n($LT-#SnBoRiX*FV&+xfh8&7%sU^vXnOxA>A;}h|W~K%fhUS*3 z=AimH+0+tz&Ul)cp+$-*s38oxa>LTp+|n%3!XU*gIn~HC6|^|Oz%nV-GBp)+4m;?! zD`U`x5@XPTYoO!AKwT!|6a#Zh&|1mVL}SC0WP?Ntqa;%!qog$Bl%y0hBTHjYemTo~ zWH+({Asel7Q%exjHU=r6Q@adIEG!K{cYcG$jSZ61Ko^384qY)aOaxsyY?zv8mIhiu zXJC|SV3ul`oNSh4VwP-Vo&;JY4H{@OGdHwMvM@7Gv`n$E1noahF-|hJ09~I8y1&E% zbh2kEXq7Bz+YD&Yo<*9aaiT@CF}SPA$h-^LmAR?K#fj<2snG(oipkX65WKM_Ez#1* z1k^tR9h486PDnFJ1DyhAl$r=$Ze?kd3c7J9)zZYw(9pynHOVZ^%p}d&$kM{XGBGhZ z#ULrwz{t`#$-)e@Cpp#JA`#T+GD`w&Hvru=Wt?ULIv^K3>ztC5XbOra==>5(B#J}x z63a5vLHA9=s~JM~iRCZ~bUVlV*RW^a^iWMN@!2)aKx$ryCi zHfW1cT1r|9Xx7xy#M~$?IT4gM(vlM`ER#XEyQWyCCR-$%nS<`Zu}HE^HA_rQG5{SA zWS){{lmuFW30m5gVqgN=P7Z3!GFR_G4o%QZetuDIVqP+0O4B&e)XXr^+{7p)HPOrh z)SgL9P6RC(1D#h5T8&|mm;zd$Z)j|6U}j`skqp`|X>Md}Y6QA>CN0e<)x^LOwC2?) zDaFXZ*aCEnuVrGA0ccMYc<)gvXd=_Z)YK%&*dWaibkM(M03|9~bW3_(*`Mn<5e`bH_1$%z)GX(?%` zrk0=?0MNC)scDwRre>Cgpee6Z&|2F>L(oBurim8D#)hc|DT#>&$!V!6N#I5gX!Wrv zX!h7JDH(LvrXlFq9t+cCGYj)1&@G#37N85`Qc^+pTv(WaXUU|DQOZb2F9x0*lRyXj zn5U*0TNg%nd=SyUjrNsv4PDn5SBr8JMP-S(v7! znwy$~H^dr)<|$1QEzM1g&CLvql0b6+h?AXk^<^onS=H)7$=*Vf_GM$r-E*x1)b+%WC*!8 zm+vve!RGozIM@ihn8_?TEfsW{by89q=zjY&i)6zz(0y8yep7UrOB_@JABEK Date: Sat, 9 May 2026 11:40:12 +0200 Subject: [PATCH 35/59] fetchPnpmDeps: use writableTmpDirAsHomeHook Signed-off-by: Sefa Eyeoglu --- pkgs/build-support/node/fetch-pnpm-deps/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index 80b637b57ddf..bba11ef60560 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -87,6 +87,7 @@ in moreutils pnpm # from args pnpm-fixup-state-db' + writableTmpDirAsHomeHook yq zstd ] @@ -104,8 +105,6 @@ in exit 1 fi - export HOME=$(mktemp -d) - # For fetcherVersion < 3, the pnpm store files are placed directly into $out. # For fetcherVersion >= 3, it is bundled into a compressed tarball within $out, # without distributing the uncompressed store files. From 83ace87bc75eac42d93463c6cc2bac18336fc9d3 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 9 May 2026 11:41:40 +0200 Subject: [PATCH 36/59] fetchPnpmDeps,pnpmConfigHook: add support for pnpm 11 pnpm 11 does not support configuring some options through its new global config format. As a workaround, we can define these environment variables instead. This also adds support for the new pmOnFail option in pnpm 11 that replaces managePackageManagerVersions. Signed-off-by: Sefa Eyeoglu --- .../node/fetch-pnpm-deps/default.nix | 35 +++++++++++++------ .../node/fetch-pnpm-deps/pnpm-config-hook.sh | 22 +++++++++--- 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index bba11ef60560..79dcddbb4a81 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -99,6 +99,11 @@ in installPhase = '' runHook preInstall + versionAtLeast () { + local cur_version=$1 min_version=$2 + printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC + } + lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" @@ -115,19 +120,29 @@ in storePath=$out fi - # If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs, - # any pnpm command would fail in that directory, the following disables this - pushd .. - pnpm config set manage-package-manager-versions false + pushd "$HOME" + pnpmVersion=$(pnpm --version) + + if versionAtLeast "$pnpmVersion" "11"; then + # pnpm 11 uses a different mechanism to manage package manager versions + export pnpm_config_pm_on_fail=ignore + + # Some packages produce platform dependent outputs. We do not want to cache those in the global store + export pnpm_config_side_effects_cache false + + export pnpm_config_update_notifier false + else + pnpm config set manage-package-manager-versions false + pnpm config set side-effects-cache false + pnpm config set update-notifier false + fi popd pnpm config set store-dir $storePath - # Some packages produce platform dependent outputs. We do not want to cache those in the global store - pnpm config set side-effects-cache false - # As we pin pnpm versions, we don't really care about updates - pnpm config set update-notifier false + # Run any additional pnpm configuration commands that users provide. ${prePnpmInstall} + # pnpm is going to warn us about using --force # --force allows us to fetch all dependencies including ones that aren't meant for our host platform pnpm install \ @@ -150,7 +165,7 @@ in runHook preFixup # Remove timestamp and sort the json files - rm -rf $storePath/{v3,v10}/tmp + rm -rf $storePath/{v3,v10,v11}/tmp for f in $(find $storePath -name "*.json"); do jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f done @@ -161,7 +176,7 @@ in # This folder contains symlinks to /build/source which we don't need # since https://github.com/pnpm/pnpm/releases/tag/v10.27.0 - rm -rf $storePath/{v3,v10}/projects + rm -rf $storePath/{v3,v10,v11}/projects # Ensure consistent permissions # NOTE: For reasons not yet fully understood, pnpm might create files with diff --git a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh index 2590de95343a..f9c19341d00b 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh +++ b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh @@ -1,5 +1,10 @@ # shellcheck shell=bash +versionAtLeast () { + local cur_version=$1 min_version=$2 + printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC +} + pnpmConfigHook() { echo "Executing pnpmConfigHook" @@ -17,13 +22,18 @@ pnpmConfigHook() { exit 1 fi - # If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs, - # any pnpm command would fail in that directory, the following disables this - pushd $HOME - pnpm config set manage-package-manager-versions false + pushd "$HOME" + pnpmVersion=$(pnpm --version) + + if versionAtLeast "$pnpmVersion" "11"; then + # pnpm 11 uses a different mechanism to manage package manager versions + export pnpm_config_pm_on_fail=ignore + else + pnpm config set manage-package-manager-versions false + fi popd - echo "Found 'pnpm' with version '$(pnpm --version)'" + echo "Found 'pnpm' with version '$pnpmVersion'" fetcherVersion=$(cat "${pnpmDeps}/.fetcher-version" || echo 1) @@ -33,7 +43,9 @@ pnpmConfigHook() { export STORE_PATH=$(mktemp -d) export npm_config_arch="@npmArch@" + export pnpm_config_arch="@npmArch@" export npm_config_platform="@npmPlatform@" + export pnpm_config_platform="@npmPlatform@" if [[ $fetcherVersion -ge 3 ]]; then tar --zstd -xf "$pnpmDeps/pnpm-store.tar.zst" -C "$STORE_PATH" From 53dd2d01c05413a1f43a4c0ae2e7470f6e678e8a Mon Sep 17 00:00:00 2001 From: lukas-sgx Date: Mon, 11 May 2026 19:10:26 +0200 Subject: [PATCH 37/59] nixos/starship: respect pre-set STARSHIP_CONFIG env variable --- nixos/modules/programs/starship.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/starship.nix b/nixos/modules/programs/starship.nix index 3f9ba0a02435..849c91b12ed3 100644 --- a/nixos/modules/programs/starship.nix +++ b/nixos/modules/programs/starship.nix @@ -116,7 +116,7 @@ in # config file. starship appears to use a hardcoded config location # rather than one inside an XDG folder: # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651 - if [[ ! -f "$HOME/.config/starship.toml" ]]; then + if [[ ! -f "$${STARSHIP_CONFIG:-$HOME/.config/starship.toml}" ]]; then export STARSHIP_CONFIG=${settingsFile} fi eval "$(${cfg.package}/bin/starship init bash --print-full-init)" @@ -129,7 +129,8 @@ in # config file. starship appears to use a hardcoded config location # rather than one inside an XDG folder: # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651 - if not test -f "$HOME/.config/starship.toml"; + set -q STARSHIP_CONFIG; or set STARSHIP_CONFIG "$HOME/.config/starship.toml" + if not test -f "$STARSHIP_CONFIG" set -x STARSHIP_CONFIG ${settingsFile} end ${lib.optionalString (!isNull cfg.transientPrompt.left) '' @@ -153,7 +154,7 @@ in # config file. starship appears to use a hardcoded config location # rather than one inside an XDG folder: # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651 - if [[ ! -f "$HOME/.config/starship.toml" ]]; then + if [[ ! -f "$${STARSHIP_CONFIG:-$HOME/.config/starship.toml}" ]]; then export STARSHIP_CONFIG=${settingsFile} fi eval "$(${cfg.package}/bin/starship init zsh)" @@ -167,8 +168,11 @@ in # config file. starship appears to use a hardcoded config location # rather than one inside an XDG folder: # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651 - if not `$HOME/.config/starship.toml`: + import os as _os + _sc = _os.environ.get('STARSHIP_CONFIG', _os.path.join(_os.environ['HOME'], '.config/starship.toml')) + if not _os.path.isfile(_sc): $STARSHIP_CONFIG = ('${settingsFile}') + del _os, _sc execx($(${cfg.package}/bin/starship init xonsh)) ''; }; From 1f457fe8ccdf2b83b1639eedf2a3f65951e26ce2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 19:04:15 +0000 Subject: [PATCH 38/59] trufflehog: 3.95.2 -> 3.95.3 --- pkgs/by-name/tr/trufflehog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index 1c3523c96949..310fbcf9507d 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "trufflehog"; - version = "3.95.2"; + version = "3.95.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${finalAttrs.version}"; - hash = "sha256-7hHeJ+RBUUBznl9gm6IwemFsHLiKHh6B7T96jpEsAC0="; + hash = "sha256-FFYDlETo7r2j1e4l+oJ3yWn1hUyA/4Xe7onrX8GidZg="; }; vendorHash = "sha256-2WBdBsOXjj4/9hLA+yk5PQAqOgi5vn1cH4NnkHg8umI="; From 7d318dfe3b95f6ce5f97db40a3b2dee704d75227 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 30 Mar 2026 22:57:31 +0200 Subject: [PATCH 39/59] pnpm_11: init at 11.1.0 Signed-off-by: Sefa Eyeoglu --- .../javascript.section.md | 56 ++++------------ .../node/fetch-pnpm-deps/serve.nix | 5 ++ pkgs/development/tools/pnpm/default.nix | 4 ++ pkgs/development/tools/pnpm/generic.nix | 29 +++++---- pkgs/test/pnpm/default.nix | 1 + pkgs/test/pnpm/pnpm-fixup-state-db/index.db | Bin 65536 -> 61440 bytes pkgs/test/pnpm/pnpm_11/default.nix | 60 ++++++++++++++++++ pkgs/test/pnpm/pnpm_11/src/.gitignore | 2 + pkgs/test/pnpm/pnpm_11/src/index.ts | 1 + pkgs/test/pnpm/pnpm_11/src/package.json | 20 ++++++ pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml | 39 ++++++++++++ pkgs/test/pnpm/pnpm_11/src/tsconfig.json | 13 ++++ pkgs/top-level/all-packages.nix | 3 +- 13 files changed, 176 insertions(+), 57 deletions(-) create mode 100644 pkgs/test/pnpm/pnpm_11/default.nix create mode 100644 pkgs/test/pnpm/pnpm_11/src/.gitignore create mode 100644 pkgs/test/pnpm/pnpm_11/src/index.ts create mode 100644 pkgs/test/pnpm/pnpm_11/src/package.json create mode 100644 pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml create mode 100644 pkgs/test/pnpm/pnpm_11/src/tsconfig.json diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 362130e5ba5f..58a0805cc58d 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -305,7 +305,7 @@ This package puts the corepack wrappers for pnpm and yarn in your PATH, and they ### pnpm {#javascript-pnpm} -pnpm is available as the top-level package `pnpm`. Additionally, there are variants pinned to certain major versions, like `pnpm_8`, `pnpm_9` and `pnpm_10`, which support different sets of lock file versions. +pnpm is available as the top-level package `pnpm`. Additionally, there are variants pinned to certain major versions, like `pnpm_8`, `pnpm_9`, `pnpm_10`, `pnpm_10_29_2` and `pnpm_11`, which support different sets of lock file versions. When packaging an application that includes a `pnpm-lock.yaml`, you need to fetch the pnpm store for that project using a fixed-output-derivation. The function `fetchPnpmDeps` can create this pnpm store derivation. In conjunction, the setup hook `pnpmConfigHook` will prepare the build environment to install the pre-fetched dependencies store. Here is an example for a package that contains `package.json` and a `pnpm-lock.yaml` files using the fetcher and setup hook above: @@ -313,11 +313,18 @@ When packaging an application that includes a `pnpm-lock.yaml`, you need to fetc { fetchPnpmDeps, nodejs, - pnpm, + pnpm_11, pnpmConfigHook, stdenv, }: - +let + # It is recommended to pin pnpm to a major version, due to regular breaking changes in the store format + # The latest major version is always available under `pkgs.pnpm` + # Optionally override pnpm to use a custom nodejs version + # Make sure that the same nodejs version is referenced in nativeBuildInputs + # pnpm = pnpm_11.override { nodejs = nodejs_24; }; + pnpm = pnpm_11; +in stdenv.mkDerivation (finalAttrs: { pname = "foo"; version = "0-unstable-1980-01-01"; @@ -334,54 +341,13 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "..."; }; }) ``` -It is highly recommended to use a pinned version of pnpm (i.e., `pnpm_9` or `pnpm_10`), to increase future reproducibility. It might also be required to use an older version if the package needs support for a certain lock file version. To do so, you can pass the `pnpm` argument to `fetchPnpmDeps` and override the `pnpm` arg in `pnpmConfigHook`. Here are the changes in the example above to use a pinned pnpm version: - - - -```diff - { - fetchPnpmDeps, - nodejs, -- pnpm, -+ pnpm_10, - pnpmConfigHook, - stdenv, - }: -+let -+ # Optionally override pnpm to use a custom nodejs version -+ # Make sure that the same nodejs version is referenced in nativeBuildInputs -+ # pnpm = pnpm_10.override { nodejs = nodejs_20; }; -+in - stdenv.mkDerivation (finalAttrs: { - pname = "foo"; - version = "0-unstable-1980-01-01"; - - src = { - #... - }; - - nativeBuildInputs = [ - nodejs # in case scripts are run outside of a pnpm call - pnpmConfigHook -- pnpm # At least required by pnpmConfigHook, if not other (custom) phases -+ pnpm_10 # At least required by pnpmConfigHook, if not other (custom) phases - ]; - - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname version src; -+ pnpm = pnpm_10; - fetcherVersion = 3; - hash = "..."; - }; - }) -``` - In case you are patching `package.json` or `pnpm-lock.yaml`, make sure to pass `finalAttrs.patches` to the function as well (i.e., `inherit (finalAttrs) patches`. `pnpmConfigHook` supports adding additional `pnpm install` flags via `pnpmInstallFlags` which can be set to a Nix string array: diff --git a/pkgs/build-support/node/fetch-pnpm-deps/serve.nix b/pkgs/build-support/node/fetch-pnpm-deps/serve.nix index 9aa5d380a0cd..46288e974660 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/serve.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/serve.nix @@ -3,6 +3,7 @@ pnpm, pnpmDeps, zstd, + lib, }: writeShellApplication { @@ -41,4 +42,8 @@ writeShellApplication { pnpm server start \ --store-dir "$storePath" ''; + + meta = { + broken = lib.versionAtLeast pnpm.version "11"; + }; } diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 3975dbc04277..c1423124fc24 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -25,6 +25,10 @@ let version = "10.33.4"; hash = "sha256-jnDdxmSbGLw9iVzzqQjAKR6kw4A5rYcixH4Bja8enPw="; }; + "11" = { + version = "11.1.0"; + hash = "sha256-VzyCrTVuiwl+bKxIG3OB+d7tM6MYr38xGYSFjr4fl+8="; + }; }; callPnpm = variant: callPackage ./generic.nix { inherit (variant) version hash; }; diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 76a0b40835e4..aa50a4fd3a52 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -10,6 +10,7 @@ testers, buildPackages, bashNonInteractive, + tests, withNode ? true, version, @@ -43,16 +44,21 @@ stdenvNoCC.mkDerivation (finalAttrs: { rm -r package/dist/reflink.*node package/dist/vendor ''; - installPhase = '' - runHook preInstall + installPhase = + let + # Use ESM pnpm for versions > 11 + ext = if lib.versionOlder finalAttrs.version "11" then "cjs" else "mjs"; + in + '' + runHook preInstall - install -d $out/{bin,libexec} - cp -R . $out/libexec/pnpm - ln -s $out/libexec/pnpm/bin/pnpm.cjs $out/bin/pnpm - ln -s $out/libexec/pnpm/bin/pnpx.cjs $out/bin/pnpx + install -d $out/{bin,libexec} + cp -R . $out/libexec/pnpm + ln -s $out/libexec/pnpm/bin/pnpm.${ext} $out/bin/pnpm + ln -s $out/libexec/pnpm/bin/pnpx.${ext} $out/bin/pnpx - runHook postInstall - ''; + runHook postInstall + ''; postInstall = if lib.toInt (lib.versions.major version) < 9 then @@ -105,9 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { ); inherit nodejs majorVersion; - tests.version = lib.optionalAttrs withNode ( - testers.testVersion { package = finalAttrs.finalPackage; } - ); + tests = { + inherit (tests) pnpm; + version = lib.optionalAttrs withNode (testers.testVersion { package = finalAttrs.finalPackage; }); + }; updateScript = writeScript "pnpm-update-script" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix index 85874ec1a57f..8cc5708ec735 100644 --- a/pkgs/test/pnpm/default.nix +++ b/pkgs/test/pnpm/default.nix @@ -2,4 +2,5 @@ { pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { }; pnpm-fixup-state-db = callPackage ./pnpm-fixup-state-db { }; + pnpm_11 = callPackage ./pnpm_11 { }; } diff --git a/pkgs/test/pnpm/pnpm-fixup-state-db/index.db b/pkgs/test/pnpm/pnpm-fixup-state-db/index.db index 705910416a042a68be532125cea69f6f6ee943dc..aa5dcd007e269e2024d09d8e4a995fa0b588a1ad 100644 GIT binary patch delta 13499 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 delta 11263 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 PHg297p2e}T;V2UT#`6ba diff --git a/pkgs/test/pnpm/pnpm_11/default.nix b/pkgs/test/pnpm/pnpm_11/default.nix new file mode 100644 index 000000000000..bf3ab4d4f551 --- /dev/null +++ b/pkgs/test/pnpm/pnpm_11/default.nix @@ -0,0 +1,60 @@ +{ + fetchPnpmDeps, + lib, + makeShellWrapper, + nodejs, + pnpmConfigHook, + pnpm_11, + stdenv, + testers, +}: +let + pnpm = pnpm_11; +in +stdenv.mkDerivation (finalAttrs: { + pname = "pnpm-test"; + inherit (pnpm) version; + + src = ./src; + + pnpmDeps = testers.invalidateFetcherByDrvHash fetchPnpmDeps { + inherit (finalAttrs) pname version src; + inherit pnpm; + fetcherVersion = 3; + hash = "sha256-+Vrv5ZiVIARDZrR5/4OYRmaecQQZmcZFtMjK4qhXKb8="; + }; + + nativeBuildInputs = [ + makeShellWrapper + nodejs + pnpm + pnpmConfigHook + ]; + + buildPhase = '' + runHook preBuild + + pnpm build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/lib/pnpm-11-test dist/index.js + + makeWrapper ${lib.getExe nodejs} $out/bin/pnpm11test \ + --add-flags "$out/lib/pnpm11test" + + runHook postInstall + ''; + + __structuredAttrs = true; + + meta = { + license = lib.licenses.mit; + mainProgram = "pnpm11test"; + inherit (pnpm.meta) maintainers; + }; +}) diff --git a/pkgs/test/pnpm/pnpm_11/src/.gitignore b/pkgs/test/pnpm/pnpm_11/src/.gitignore new file mode 100644 index 000000000000..1eae0cf6700c --- /dev/null +++ b/pkgs/test/pnpm/pnpm_11/src/.gitignore @@ -0,0 +1,2 @@ +dist/ +node_modules/ diff --git a/pkgs/test/pnpm/pnpm_11/src/index.ts b/pkgs/test/pnpm/pnpm_11/src/index.ts new file mode 100644 index 000000000000..accefceba62b --- /dev/null +++ b/pkgs/test/pnpm/pnpm_11/src/index.ts @@ -0,0 +1 @@ +console.log("Hello World"); diff --git a/pkgs/test/pnpm/pnpm_11/src/package.json b/pkgs/test/pnpm/pnpm_11/src/package.json new file mode 100644 index 000000000000..1eb3b51b3886 --- /dev/null +++ b/pkgs/test/pnpm/pnpm_11/src/package.json @@ -0,0 +1,20 @@ +{ + "name": "pnpm11test", + "version": "1.0.0", + "description": "", + "main": "dist/index.js", + "scripts": { + "build": "tsc", + "start": "node dist/index.js" + }, + "license": "MIT", + "packageManager": "pnpm", + "type": "module", + "files": [ + "dist/" + ], + "devDependencies": { + "@types/node": "^25.5.0", + "typescript": "^6.0.2" + } +} diff --git a/pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml b/pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml new file mode 100644 index 000000000000..def71aa4e5a2 --- /dev/null +++ b/pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml @@ -0,0 +1,39 @@ +lockfileVersion: '9.0' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + +importers: + + .: + devDependencies: + '@types/node': + specifier: ^25.5.0 + version: 25.5.0 + typescript: + specifier: ^6.0.2 + version: 6.0.2 + +packages: + + '@types/node@25.5.0': + resolution: {integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==} + + typescript@6.0.2: + resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==} + engines: {node: '>=14.17'} + hasBin: true + + undici-types@7.18.2: + resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==} + +snapshots: + + '@types/node@25.5.0': + dependencies: + undici-types: 7.18.2 + + typescript@6.0.2: {} + + undici-types@7.18.2: {} diff --git a/pkgs/test/pnpm/pnpm_11/src/tsconfig.json b/pkgs/test/pnpm/pnpm_11/src/tsconfig.json new file mode 100644 index 000000000000..3471bd329666 --- /dev/null +++ b/pkgs/test/pnpm/pnpm_11/src/tsconfig.json @@ -0,0 +1,13 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "NodeNext", + "moduleResolution": "NodeNext", + "outDir": "dist", + "rootDir": ".", + "strict": true, + "esModuleInterop": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0133a2683d37..f864001a47cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3141,8 +3141,9 @@ with pkgs; pnpm_9 pnpm_10_29_2 pnpm_10 + pnpm_11 ; - pnpm = pnpm_10; + pnpm = pnpm_11; inherit (callPackages ../build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps From 574e3c6cefa79da2f659ab82bb37494aee8eab74 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Mon, 11 May 2026 14:25:51 -0700 Subject: [PATCH 40/59] dablin: remove unused pcre dependency --- pkgs/by-name/da/dablin/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix index 644c13ee5b0c..bddcbf70b9bc 100644 --- a/pkgs/by-name/da/dablin/package.nix +++ b/pkgs/by-name/da/dablin/package.nix @@ -8,7 +8,6 @@ SDL2, gtkmm3, faad2, - pcre, }: stdenv.mkDerivation (finalAttrs: { @@ -32,7 +31,6 @@ stdenv.mkDerivation (finalAttrs: { mpg123 SDL2 gtkmm3 - pcre ]; meta = { From 7482fdacb1b2520e5248e572a22778edca359bdc Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 12 May 2026 00:37:19 +0200 Subject: [PATCH 41/59] iina: 1.4.1 -> 1.4.2 --- pkgs/by-name/ii/iina/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index 25c002a44172..51a280835fbc 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "iina"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://github.com/iina/iina/releases/download/v${finalAttrs.version}/IINA.v${finalAttrs.version}.dmg"; - hash = "sha256-F3rUaeoSm+2VqCrFm1+1jQoGw1NC/KejfbohSogh+Eg="; + hash = "sha256-Lg/Yn7uhySpsEVFx5bUZBIg7tJf75ROmlh0ID7qwj/Y="; }; nativeBuildInputs = [ undmg ]; From a3ad76573da2f6e1d262caddf925ff59bff30fe6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 11 May 2026 23:37:31 +0000 Subject: [PATCH 42/59] python3Packages.timm: 1.0.26 -> 1.0.27 Diff: https://github.com/huggingface/pytorch-image-models/compare/v1.0.26...v1.0.27 Changelog: https://github.com/huggingface/pytorch-image-models/blob/v1.0.27/README.md#whats-new --- pkgs/development/python-modules/timm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index 57d7e19173b2..2f7167e4b287 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -23,14 +23,15 @@ buildPythonPackage (finalAttrs: { pname = "timm"; - version = "1.0.26"; + version = "1.0.27"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; tag = "v${finalAttrs.version}"; - hash = "sha256-pbzDoNRRwz41b4X40yBp7oTcJ2e/Y2dKyj9XbEX5c34="; + hash = "sha256-Tur4niy89MyMJ8TD7+zBY6x/tmvtYDkruksf65KdTkE="; }; # Fix torch 2.11.0 compatibility From ecfb42134282140d2c34dc245d1df8d5aca535a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 03:26:30 +0000 Subject: [PATCH 43/59] vuls: 0.38.6 -> 0.39.0 --- pkgs/by-name/vu/vuls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix index 26326b77d9da..37b71918ab43 100644 --- a/pkgs/by-name/vu/vuls/package.nix +++ b/pkgs/by-name/vu/vuls/package.nix @@ -6,17 +6,17 @@ buildGoModule (finalAttrs: { pname = "vuls"; - version = "0.38.6"; + version = "0.39.0"; src = fetchFromGitHub { owner = "future-architect"; repo = "vuls"; tag = "v${finalAttrs.version}"; - hash = "sha256-DY2woiaA6RisbOmHMoIr3sLn2kEccru58LGtST/iY3E="; + hash = "sha256-pK8bW/1Bq8MCGBRBWt4u6DMFjUitWFbJNr9ekP54X6s="; fetchSubmodules = true; }; - vendorHash = "sha256-s2N6MCcqMfwjW095iwOv8hHcrB6NC6XSkrtdSGWq8bE="; + vendorHash = "sha256-Oc1THgqt7MC+mE5X+4tFZPlVQKWaUD4gdxcD1rMfcAI="; ldflags = [ "-s" From d49d2a76bee5cb53c96b33c6b63671677dd3bc4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 03:28:32 +0000 Subject: [PATCH 44/59] libretro.fceumm: 0-unstable-2026-04-20 -> 0-unstable-2026-05-06 --- pkgs/applications/emulators/libretro/cores/fceumm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix index 43600cf59fca..3abd97a160f1 100644 --- a/pkgs/applications/emulators/libretro/cores/fceumm.nix +++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-05-06"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "448a231618186b2af0bb9d6e37aeca05467e112f"; - hash = "sha256-Kr3DEAk8dsFnUT73pOp5qwkCbcDItQwrRMI8hobrCuI="; + rev = "3a84a6fd0ba20dd4877c06b1d58741172148395f"; + hash = "sha256-4+kEoN0+SWl284n7tIR76aysf0GlLdxELDXfpEK6mi8="; }; meta = { From a5468644af8b3a00f850b979bcc3172572239220 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 03:28:37 +0000 Subject: [PATCH 45/59] python3Packages.alexapy: 1.29.21 -> 1.29.22 --- pkgs/development/python-modules/alexapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix index 1cc560e1cecf..0ba4c70a90bd 100644 --- a/pkgs/development/python-modules/alexapy/default.nix +++ b/pkgs/development/python-modules/alexapy/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "alexapy"; - version = "1.29.21"; + version = "1.29.22"; pyproject = true; src = fetchFromGitLab { owner = "keatontaylor"; repo = "alexapy"; tag = "v${finalAttrs.version}"; - hash = "sha256-8oUgttLAhPSB7uysoObxqu0lYre8Y1qg/8m7NhwPazI="; + hash = "sha256-mWEotNbG4On7EqwPX5bVWr1ZRi4WdzCwJ06NXc/9RL4="; }; pythonRelaxDeps = [ "aiofiles" ]; From 90f30d036c72c63742934d87eb18fbcf7eb8fb02 Mon Sep 17 00:00:00 2001 From: Arthur Azevedo de Amorim Date: Tue, 12 May 2026 00:21:06 -0400 Subject: [PATCH 46/59] coqPackages.deriving: 0.2.2 -> 0.2.3 Co-Authored-By: Claude Opus 4.7 (1M context) --- pkgs/development/coq-modules/deriving/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 043005105356..bc8176069916 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -26,6 +26,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version ssreflect.version ] [ + (case (range "8.17" "9.1") (range "2.0.0" "2.5.0") "0.2.3") (case (range "8.17" "9.1") (range "2.0.0" "2.5.0") "0.2.2") (case (range "8.17" "9.0") (range "2.0.0" "2.3.0") "0.2.1") (case (range "8.17" "8.20") (range "2.0.0" "2.2.0") "0.2.0") @@ -35,6 +36,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."0.2.3".sha256 = "sha256-LqrSlML5pA84FGY4C/xm1EKSgjDe+NaQCSFg2ggdPHE="; release."0.2.2".sha256 = "sha256-qsbyQ4spg5vVLZkechb2LoBazGjMh7pR9sSS0s7tXxs="; release."0.2.1".sha256 = "sha256-053bNa3rcy0fCs9CQoKPxDLXnKRHzteyClLDURpaZJo="; release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM="; From 1fbb89002ab09ee2277f0c6fd2ce9304b9ac098e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 05:37:42 +0000 Subject: [PATCH 47/59] wavelog: 2.4 -> 2.4.2 --- pkgs/by-name/wa/wavelog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix index 964d42178027..1ddda41c5c86 100644 --- a/pkgs/by-name/wa/wavelog/package.nix +++ b/pkgs/by-name/wa/wavelog/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wavelog"; - version = "2.4"; + version = "2.4.2"; src = fetchFromGitHub { owner = "wavelog"; repo = "wavelog"; tag = finalAttrs.version; - hash = "sha256-ELCLVZ0CiXcefxDKpE3AODDzDCgnljXY/ooy0U+ut54="; + hash = "sha256-qEGqAPRDXxO33CUfoIG1PjigEDhhCRTAvilrKZ1bvfI="; }; installPhase = '' From 19d7d720740b32568f33822c9cf4523fec23bcc3 Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 12 May 2026 08:31:04 +0200 Subject: [PATCH 48/59] jaq: add stable release regex to update script to avoid updating to pre-release versions. For example: https://github.com/NixOS/nixpkgs/pull/518560 --- pkgs/by-name/ja/jaq/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix index 545594988841..9aca0ac88eef 100644 --- a/pkgs/by-name/ja/jaq/package.nix +++ b/pkgs/by-name/ja/jaq/package.nix @@ -28,7 +28,9 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v(\\d+\\.\\d+\\.\\d+)$" ]; + }; tests.simple = runCommand "jaq-test" { From 0414ba635db3df854dda606981492b7a33b0bc43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 06:45:01 +0000 Subject: [PATCH 49/59] python3Packages.jupyterhub: 5.4.5 -> 5.4.6 --- pkgs/development/python-modules/jupyterhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index b7b9109a7278..bd3939370266 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: { pname = "jupyterhub"; - version = "5.4.5"; + version = "5.4.6"; pyproject = true; __structuredAttrs = true; @@ -59,7 +59,7 @@ buildPythonPackage (finalAttrs: { owner = "jupyterhub"; repo = "jupyterhub"; tag = finalAttrs.version; - hash = "sha256-MdwH9IAV12GqmWc0tfCUi2NA5sT0BFlwCr20JVRzduU="; + hash = "sha256-ndL5pE332VDlCk16XYUDaXhsg/J8ndGtgDhKct+y26c="; }; npmDeps = fetchNpmDeps { From 29314531c4bb0d1ce30443ebd64490ded25280eb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 12 May 2026 08:14:56 +0200 Subject: [PATCH 50/59] =?UTF-8?q?ocamlPackages.ca-certs:=201.0.1=20?= =?UTF-8?q?=E2=86=92=201.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ca-certs/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index 8c741e1931b9..4645f8971396 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -16,13 +16,11 @@ buildDunePackage (finalAttrs: { pname = "ca-certs"; - version = "1.0.1"; - - minimalOCamlVersion = "4.08"; + version = "1.0.3"; src = fetchurl { url = "https://github.com/mirage/ca-certs/releases/download/v${finalAttrs.version}/ca-certs-${finalAttrs.version}.tbz"; - hash = "sha256-0818j1SLrs7yCNQlh3qBHYmOx9HZxL3qb3hlLHyDYcw="; + hash = "sha256-At/J53cLGCGN8uJRGScR3UTFhYrSRXVpOxRas9fUHCk="; }; propagatedBuildInputs = [ From d3e90001a881f47cce38819aa1443ba0be2f256d Mon Sep 17 00:00:00 2001 From: Lyna Date: Tue, 12 May 2026 08:38:39 +0100 Subject: [PATCH 51/59] porxie: 0.2.0 -> 0.3.0 --- pkgs/by-name/po/porxie/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/porxie/package.nix b/pkgs/by-name/po/porxie/package.nix index 4eade1cf6aa3..8a0369e2026e 100644 --- a/pkgs/by-name/po/porxie/package.nix +++ b/pkgs/by-name/po/porxie/package.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "porxie"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromCodeberg { owner = "Blooym"; repo = "porxie"; rev = "v${finalAttrs.version}"; - hash = "sha256-BLlsvzmAQj/N1pmw+ZMBmC48O4SPvvLWDD198ihXR+k="; + hash = "sha256-mClUYDBgOtX0WcCG0rXhgnKFqnvE2UOFH3PABeF+pkI="; }; - cargoHash = "sha256-4gRC7ZXok9oshUCkDBhxtbnxma224smaL4GcCgdCkSc="; + cargoHash = "sha256-SImynSnWJ/tiEoSYuFYQ/JncMeierAioZO2Fnx6FHN4="; buildInputs = [ rust-jemalloc-sys ]; From 670fdf6db990b900bb7584f2f27c70e6c02da3a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 07:53:10 +0000 Subject: [PATCH 52/59] terraform-providers.aiven_aiven: 4.55.2 -> 4.56.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 68bccf2ae7e9..2dff01e29c48 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,13 +27,13 @@ "vendorHash": null }, "aiven_aiven": { - "hash": "sha256-0f+ZxjMoPyOL4qatcRVk8jjn9TAZkinUX7eYQ1hv+FQ=", + "hash": "sha256-ni4Y5MRnu6AL491wRD8UoQ4MJmnopumYoq59wGujSUQ=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.55.2", + "rev": "v4.56.0", "spdx": "MIT", - "vendorHash": "sha256-toCbbqzi0h6hUeyKMClUBcWsh8+H00K0IjdkgZ5HmOs=" + "vendorHash": "sha256-vSSgABGm1aHGVPIsNXylpan8E07eOQ/Nc8Lf1N3+P5c=" }, "akamai_akamai": { "hash": "sha256-/+IE06obx4Rxzz3uh5QbeS/FhGlK2qTJJFWGAlDWJaw=", From 5e77c83b0428ac08166f4376b10b87dff2e26867 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 07:54:25 +0000 Subject: [PATCH 53/59] terraform-providers.hashicorp_google-beta: 7.30.0 -> 7.31.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 68bccf2ae7e9..f228ab5da339 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -580,13 +580,13 @@ "vendorHash": "sha256-UoS4iIVHhCQ+Zk+SJmsMHJgJBKLMbfMVmtm4MDmzT68=" }, "hashicorp_google-beta": { - "hash": "sha256-ltqZ6nyl/leYsV2pBJVgOtcOYIyfDmDLsZLfHTPOyew=", + "hash": "sha256-/HxUOhDATteiUDIeA8zvGI9xQ5rOWJAhLN9PLHiBFfI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.30.0", + "rev": "v7.31.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-WMfT/gtjRDACXWDf1w3cUiEUdeFrGAnYvDQcuXiQNkk=" + "vendorHash": "sha256-5PnJ87cGMCwEl7zEwjbzgU5kZO9IC4Ls47HX2SZ2h2w=" }, "hashicorp_helm": { "hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=", From 12461a3912e07e5f70100870fd2b7a2034ae4d60 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 12 May 2026 07:45:19 +0000 Subject: [PATCH 54/59] nixl: 1.0.1 -> 1.1.0 Diff: https://github.com/ai-dynamo/nixl/compare/v1.0.1...v1.1.0 Changelog: https://github.com/ai-dynamo/nixl/releases/tag/v1.1.0 --- pkgs/by-name/ni/nixl/package.nix | 6 ++++-- pkgs/development/python-modules/nixl/default.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixl/package.nix b/pkgs/by-name/ni/nixl/package.nix index 9df2e2b9990c..43ffdcef4e1f 100644 --- a/pkgs/by-name/ni/nixl/package.nix +++ b/pkgs/by-name/ni/nixl/package.nix @@ -21,6 +21,7 @@ liburing, numactl, taskflow, + tomlplusplus, ucx, # passthru @@ -35,7 +36,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "nixl"; - version = "1.0.1"; + version = "1.1.0"; __structuredAttrs = true; strictDeps = true; @@ -44,7 +45,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { owner = "ai-dynamo"; repo = "nixl"; tag = "v${finalAttrs.version}"; - hash = "sha256-mDpDqwUwI0baIDDpt9/wgIP3saBWY8yWKgwzHgrzJiU="; + hash = "sha256-lzR+haBtRPUJ9VE1AcPndp3CPtW7KCI3nNPeVIGyR0U="; }; postPatch = @@ -103,6 +104,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { liburing numactl taskflow + tomlplusplus ucx python3Packages.python diff --git a/pkgs/development/python-modules/nixl/default.nix b/pkgs/development/python-modules/nixl/default.nix index 8aa00155a58d..a2fb72e2ea57 100644 --- a/pkgs/development/python-modules/nixl/default.nix +++ b/pkgs/development/python-modules/nixl/default.nix @@ -50,6 +50,7 @@ buildPythonPackage.override { inherit (nixl) stdenv; } (finalAttrs: { pytest pyyaml setuptools + torch types-pyyaml ]; dontUseMesonConfigure = true; From 517ec842a7e2f7ec6075c7a96a9f1b83613f91b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 08:17:03 +0000 Subject: [PATCH 55/59] nexttrace: 1.6.4 -> 1.6.5 --- pkgs/by-name/ne/nexttrace/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix index 31becd409076..aa95a3d9d8d0 100644 --- a/pkgs/by-name/ne/nexttrace/package.nix +++ b/pkgs/by-name/ne/nexttrace/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "nexttrace"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-atouv41R49HVJui60ivh1OPIDFwtILdu4BU+x0cLVQ4="; + sha256 = "sha256-PpCWTak14Y2zZBYOtCHEjNtvrXo6JOAo/ddYrJZMou8="; }; - vendorHash = "sha256-U0OXsZ9eME2paV8+DuPGYuNdaPnfmc4AdaT6cri3Nlw="; + vendorHash = "sha256-8evslWY5EgZT5ah63t6UmREUgkuY8aYwdsox4xxyKiA="; buildInputs = [ libpcap ]; From 93fdf921bc1e6b770aafd7663c1a38f5b95bd0cc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 12 May 2026 08:02:17 +0000 Subject: [PATCH 56/59] python3Packages.tensorflow-datasets: 4.9.9 -> 4.9.10 Diff: https://github.com/tensorflow/datasets/compare/v4.9.9...v4.9.10 Changelog: https://github.com/tensorflow/datasets/releases/tag/v4.9.10 --- .../tensorflow-datasets/default.nix | 53 +++---------------- 1 file changed, 7 insertions(+), 46 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 5dde0d7682e1..5191764018e8 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -2,9 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, # build system + packaging, setuptools, # dependencies @@ -64,58 +64,22 @@ buildPythonPackage (finalAttrs: { pname = "tensorflow-datasets"; - version = "4.9.9"; + version = "4.9.10"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZXaPYmj8aozfe6ygzKybId8RZ1TqPuIOSpd8XxnRHus="; + hash = "sha256-nq0c5hBTVwkxCRvWxtnfI+AHD+URY+nNfZAurEGaLXk="; }; - patches = [ - # TypeError: Cannot handle this data type: (1, 1, 4), Date: Tue, 12 May 2026 02:22:58 +0000 Subject: [PATCH 57/59] python3Packages.chatlas: 0.16.0 -> 0.17.0 --- pkgs/development/python-modules/chatlas/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chatlas/default.nix b/pkgs/development/python-modules/chatlas/default.nix index 19018d8f821f..5a5fb904d00f 100644 --- a/pkgs/development/python-modules/chatlas/default.nix +++ b/pkgs/development/python-modules/chatlas/default.nix @@ -31,14 +31,15 @@ buildPythonPackage (finalAttrs: { pname = "chatlas"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "chatlas"; tag = "v${finalAttrs.version}"; - hash = "sha256-8dME+zY+yzPiUK2WUKlOJS6GF7UA2qSym617P2DoV68="; + hash = "sha256-wf+YYC7coJ9euOXIP9Oq7k2z8zhLZdfjVM+yxmM9MAY="; }; build-system = [ From a792d9125a813af5e6fb904abbfc7d39a5079a42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 09:11:43 +0000 Subject: [PATCH 58/59] libretro.genesis-plus-gx: 0-unstable-2026-05-01 -> 0-unstable-2026-05-08 --- .../emulators/libretro/cores/genesis-plus-gx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index be2b54bda5b9..0aa598cb972f 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2026-05-01"; + version = "0-unstable-2026-05-08"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "252694adb9ebf2abcc7a1340d4078dce53d8954f"; - hash = "sha256-mFij3fLDMvyby3ata47YJN7YuBKGv4/xphFQDiFKY3A="; + rev = "fa993f040d7150bda672b3e3ebe36c9bd2ea8904"; + hash = "sha256-4igo4uwpDwbP6oTtlF6pwDF7+WZ0FgeFCtmPVNpULBo="; }; meta = { From 15eb8c038978d01fe11ea67993dc12bb85173fea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 10:08:03 +0000 Subject: [PATCH 59/59] mycelium: 0.7.6 -> 0.7.7 --- pkgs/by-name/my/mycelium/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix index 7c0438c778c5..2350248cad8a 100644 --- a/pkgs/by-name/my/mycelium/package.nix +++ b/pkgs/by-name/my/mycelium/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mycelium"; - version = "0.7.6"; + version = "0.7.7"; sourceRoot = "${finalAttrs.src.name}/myceliumd"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "threefoldtech"; repo = "mycelium"; rev = "v${finalAttrs.version}"; - hash = "sha256-6A93ySGmnkqu+TrPsIZJNl4iw26yrUW89TkkfouArn0="; + hash = "sha256-amw0DkPT7As7L9Zhts+s4g3N67uu/BDZmbJXapr89XQ="; }; - cargoHash = "sha256-Firp6R8JZXTzJhV2Psve0kmxP6bT74xHjNq8/q0/pOc="; + cargoHash = "sha256-Shi7AbyuvWwWOm9RuUYYLS/wEqZ7/YiOo+8m2XDFAnM="; nativeBuildInputs = [ versionCheckHook ];