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/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`. 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)) ''; }; 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/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 = { 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 = { diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 68bccf2ae7e9..1f4963b33d89 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=", @@ -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=", diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index 6b33c263b895..79dcddbb4a81 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,8 @@ in jq moreutils pnpm # from args + pnpm-fixup-state-db' + writableTmpDirAsHomeHook yq zstd ] @@ -88,14 +99,17 @@ 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}!" 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. @@ -106,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 \ @@ -141,14 +165,18 @@ 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 + 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 + 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" 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/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/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 // { diff --git a/pkgs/by-name/ba/balatro-mod-manager/package.nix b/pkgs/by-name/ba/balatro-mod-manager/package.nix index 835a888d20e0..6f9a59f26eb5 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,13 +97,14 @@ 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; - maintainers = with lib.maintainers; [ mhdask ]; + platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.aarch64); + maintainers = with lib.maintainers; [ + mhdask + ryand56 + ]; mainProgram = "BMM"; }; }) 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/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 = { 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/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 ]; 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" { 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 = [ "./" ]; 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/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; 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/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 ]; 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 ]; 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/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/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/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; 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/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/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 ]; diff --git a/pkgs/by-name/po/postcss/package.nix b/pkgs/by-name/po/postcss/package.nix index 3b7d420d09f9..a36c7e74a4b4 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.14"; @@ -28,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-XLFSpq0V49Lp2bVvHc3X0w+Qwj/duZFTey/vu/Nt9Jk="; }; 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; }; } 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; }; }) 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; }; } 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; }; }) diff --git a/pkgs/by-name/rt/rt/package.nix b/pkgs/by-name/rt/rt/package.nix index cfeca25b7aa6..5582bc15bee5 100644 --- a/pkgs/by-name/rt/rt/package.nix +++ b/pkgs/by-name/rt/rt/package.nix @@ -184,5 +184,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { platforms = lib.platforms.unix; + license = lib.licenses.gpl2Only; }; }) 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; }; } 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/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 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/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; }; } 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/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"; 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; + }; } 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="; 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/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; 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/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" 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 = '' 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/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; }; } 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 116fed9c9aad..b1320ac545e8 100755 --- a/pkgs/development/compilers/dotnet/binary/update.sh +++ b/pkgs/development/compilers/dotnet/binary/update.sh @@ -7,97 +7,97 @@ 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" - 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,143 @@ 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=() + + if [[ -z "$vmr_bootstrap" ]]; then + pkgs+=( + Microsoft.AspNetCore.App.Ref + ) if versionAtLeast "$version" 10; then - pkgs+=( - Microsoft.AspNetCore.App.Internal.Assets - ) + pkgs+=( + Microsoft.AspNetCore.App.Internal.Assets + ) fi + 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 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=() + + if [[ -z "$vmr_bootstrap" ]]; then + pkgs+=( + Microsoft.NETCore.DotNetAppHost + Microsoft.NETCore.App.Ref ) if ! versionAtLeast "$version" 9; then - pkgs+=( - Microsoft.NETCore.DotNetHost - Microsoft.NETCore.DotNetHostPolicy - Microsoft.NETCore.DotNetHostResolver - ) + pkgs+=( + Microsoft.NETCore.DotNetHost + Microsoft.NETCore.DotNetHostPolicy + Microsoft.NETCore.DotNetHostResolver + ) fi if versionAtLeast "$version" 7; then - pkgs+=( - Microsoft.DotNet.ILCompiler - ) + pkgs+=( + Microsoft.DotNet.ILCompiler + ) fi + 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 rid=$2 + local pkgs=( + "Microsoft.NETCore.App.Crossgen2.$rid" + ) + 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 ;; + 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" - ) + pkgs+=( + "runtime.$rid.Microsoft.DotNet.ILCompiler" + ) fi + 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 rid=$2 + local pkgs=() + + if [[ -n "$vmr_bootstrap" ]]; then + pkgs+=( + "Microsoft.NETCore.App.Runtime.$rid" + ) + else + 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 + 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" - ) + pkgs+=( + "Microsoft.NETCore.App.Runtime.NativeAOT.$rid" + ) fi + fi - generate_package_list "$version" ' ' "${pkgs[@]}" + 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,61 +274,60 @@ 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. - # 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_only ]]; 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_only ]]; 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 +336,60 @@ 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)" + 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 channel_version support_phase - channel_version=$(jq -er '."channel-version"' <<< "$content") - support_phase=$(jq -er '."support-phase"' <<< "$content") + local aspnetcore_files runtime_files + aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" + runtime_files="$(release_files "$release_content" .runtime)" - local aspnetcore_sources runtime_sources - aspnetcore_sources="$(platform_sources "$aspnetcore_files")" - runtime_sources="$(platform_sources "$runtime_files")" + local channel_version support_phase + channel_version=$(jq -er '."channel-version"' <<< "$content") + support_phase=$(jq -er '."support-phase"' <<< "$content") - result=$(mktemp -t dotnet-XXXXXX.nix) - trap "rm -f $result" TERM INT EXIT + local aspnetcore_sources runtime_sources + aspnetcore_sources="$(platform_sources "$aspnetcore_files")" + runtime_sources="$(platform_sources "$runtime_files")" - ( - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + result=$(mktemp -t dotnet-XXXXXX.nix) + trap "rm -f $result" TERM INT EXIT + + ( + 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 +404,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 +427,55 @@ in rec { runtime = runtime_$major_minor_underscore; aspnetcore = aspnetcore_$major_minor_underscore; };" - done + done - if [[ -n $sdk ]]; then - echo " + if [[ -n $sdk_only ]]; 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 + 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_only=1 + ;; + -o) + shift + output=$1 + shift + ;; + *) + update "$1" output= - - while [ $# -gt 0 ]; do - case $1 in - --sdk) - shift - sdk=1 - ;; - -o) - shift - output=$1 - shift - ;; - *) - update "$1" "$sdk" "$output" - shift - ;; - esac - done + shift + ;; + esac + done } main "$@" 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; })); diff --git a/pkgs/development/compilers/dotnet/source/stage0.nix b/pkgs/development/compilers/dotnet/source/stage0.nix index ef08f24a024b..76cc50f977e9 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 = @@ -132,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; }); diff --git a/pkgs/development/compilers/dotnet/source/update.sh b/pkgs/development/compilers/dotnet/source/update.sh index fc78d31aab08..ea4095221f09 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 | - map(select(.PrivateSourceBuiltArtifactsVersion)) - | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) + getProperty() { + xq -er ".Project.PropertyGroup | add | .$1" "$2" + } - if [[ "$artifactsVersion" != "" ]]; then - artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh) - eval "$artifactVar" + 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 - artifactsFile=Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz + if [[ $rc == 0 ]]; then + artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh) + eval "$artifactVar" - dotnetBuildUrl=https://builds.dotnet.microsoft.com/ + artifactsFile=Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz - if [[ $major -ge 10 ]]; then - dotnetBuildUrl+=dotnet/source-build - else - dotnetBuildUrl+=source-built-artifacts/assets - fi + dotnetBuildUrl=https://builds.dotnet.microsoft.com/ - artifactsUrl=$dotnetBuildUrl/$artifactsFile + if [[ $major -ge 10 ]]; then + dotnetBuildUrl+=dotnet/source-build + else + dotnetBuildUrl+=source-built-artifacts/assets + fi - 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=$dotnetBuildUrl/$artifactsFile - artifactsHash=$(nix-prefetch-url "$artifactsUrl") - artifactsHash=$(nix-hash --to-sri --type sha256 "$artifactsHash") + curl -fsSL "$artifactsUrl" --head || { + [[ $? == 22 ]] + artifactsUrl=https://ci.dot.net/public/source-build/$artifactsFile + } + elif [[ $rc == 1 ]]; then + artifactsUrl=$(getProperty PrivateSourceBuiltArtifactsUrl eng/Versions.props) + artifactsUrl="${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}" + else + exit $rc + fi - sdkVersion=$(jq -er .tools.dotnet global.json) + artifactsHash=$(nix-prefetch-url "$artifactsUrl") + artifactsHash=$(nix-hash --to-sri --type sha256 "$artifactsHash") - # below needs to be run in nixpkgs because toOutputPath uses relative paths - cd - + sdkVersion=$(jq -er .tools.dotnet global.json) - cp "$tmp"/release.json "$output" + # below needs to be run in nixpkgs because toOutputPath uses relative paths + cd - - jq --null-input \ - --arg _0 "$tarballHash" \ - --arg _1 "$artifactsUrl" \ - --arg _2 "$artifactsHash" \ - '{ - "tarballHash": $_0, - "artifactsUrl": $_1, - "artifactsHash": $_2, - }' > "$output"/release-info.json + cp "$tmp"/release.json "$output" - if [[ $band == 1xx ]]; then - getBootstrap() { - pkgs/development/compilers/dotnet/binary/update.sh \ - -o "$output"/bootstrap-sdk.nix --sdk "$1" >&2 - } + jq --null-input \ + --arg _0 "$tarballHash" \ + --arg _1 "$artifactsUrl" \ + --arg _2 "$artifactsHash" \ + '{ + "tarballHash": $_0, + "artifactsUrl": $_1, + "artifactsHash": $_2, + }' > "$output"/release-info.json - 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 + if [[ $band == 1xx ]]; then + getBootstrap() { + pkgs/development/compilers/dotnet/binary/update.sh \ + -o "$output"/bootstrap-sdk.nix --vmr-bootstrap --sdk "$1" >&2 + } - $(nix-build -A dotnetCorePackages.dotnet_$major.vmr.fetch-deps --no-out-link) >&2 - 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 + ) } 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 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="; 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 = [ 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 { }; 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" ]; 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 = [ 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/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/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 { 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 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; 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 = [ ]; }; } 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; }; } 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), 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.${ext} $out/bin/pnpm + ln -s $out/libexec/pnpm/bin/pnpx.${ext} $out/bin/pnpx + + runHook postInstall + ''; + postInstall = if lib.toInt (lib.versions.major version) < 9 then '' @@ -97,11 +109,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; }) ); - inherit majorVersion; + 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 @@ -129,6 +142,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/"; 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 = { 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="; }; diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix index 1e7d882ce295..8cc5708ec735 100644 --- a/pkgs/test/pnpm/default.nix +++ b/pkgs/test/pnpm/default.nix @@ -1,4 +1,6 @@ { callPackage }: { 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/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 000000000000..aa5dcd007e26 Binary files /dev/null and b/pkgs/test/pnpm/pnpm-fixup-state-db/index.db differ 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/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 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75ecf2659151..40fa449d95c9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6909,6 +6909,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 { };