From db98b9a00174c52eab658dcbc4e3455f184d40d6 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 23 Jun 2025 08:48:53 +0200 Subject: [PATCH 01/61] aab: init at 1.0.0-dev.5 Co-authored-by: June Stepp --- .../aab/allow-manually-setting-modtime.patch | 124 ++++++++++++++++++ pkgs/by-name/aa/aab/fix-flaky-tests.patch | 75 +++++++++++ .../aa/aab/only-call-git-when-necessary.patch | 14 ++ pkgs/by-name/aa/aab/package.nix | 48 +++++++ 4 files changed, 261 insertions(+) create mode 100644 pkgs/by-name/aa/aab/allow-manually-setting-modtime.patch create mode 100644 pkgs/by-name/aa/aab/fix-flaky-tests.patch create mode 100644 pkgs/by-name/aa/aab/only-call-git-when-necessary.patch create mode 100644 pkgs/by-name/aa/aab/package.nix diff --git a/pkgs/by-name/aa/aab/allow-manually-setting-modtime.patch b/pkgs/by-name/aa/aab/allow-manually-setting-modtime.patch new file mode 100644 index 000000000000..27e4e455c511 --- /dev/null +++ b/pkgs/by-name/aa/aab/allow-manually-setting-modtime.patch @@ -0,0 +1,124 @@ +diff --git a/aab/builder.py b/aab/builder.py +index 5c3805c..7dfe595 100644 +--- a/aab/builder.py ++++ b/aab/builder.py +@@ -77,7 +77,7 @@ class AddonBuilder: + self._config = Config() + self._path_dist_module = PATH_DIST / "src" / self._config["module_name"] + +- def build(self, qt_versions: List[QtVersion], disttype="local", pyenv=None): ++ def build(self, qt_versions: List[QtVersion], disttype="local", pyenv=None, modtime=None): + logging.info( + "\n--- Building %s %s for %s ---\n", + self._config["display_name"], +@@ -86,7 +86,7 @@ class AddonBuilder: + ) + + self.create_dist() +- self.build_dist(qt_versions=qt_versions, disttype=disttype, pyenv=pyenv) ++ self.build_dist(qt_versions=qt_versions, disttype=disttype, pyenv=pyenv, modtime=modtime) + + return self.package_dist(qt_versions=qt_versions, disttype=disttype) + +@@ -102,7 +102,7 @@ class AddonBuilder: + PATH_DIST.mkdir(parents=True) + Git().archive(self._version, PATH_DIST) + +- def build_dist(self, qt_versions: List[QtVersion], disttype="local", pyenv=None): ++ def build_dist(self, qt_versions: List[QtVersion], disttype="local", pyenv=None, modtime=None): + self._copy_licenses() + if self._path_changelog.exists(): + self._copy_changelog() +@@ -111,7 +111,7 @@ class AddonBuilder: + if self._callback_archive: + self._callback_archive() + +- self._write_manifest(disttype) ++ self._write_manifest(disttype, modtime=modtime) + + ui_builder = UIBuilder(dist=PATH_DIST, config=self._config) + +@@ -162,12 +162,13 @@ class AddonBuilder: + + return out_path + +- def _write_manifest(self, disttype): ++ def _write_manifest(self, disttype, modtime=None): + ManifestUtils.generate_and_write_manifest( + addon_properties=self._config, + version=self._version, + dist_type=disttype, + target_dir=self._path_dist_module, ++ modtime=modtime, + ) + + def _copy_licenses(self): +diff --git a/aab/cli.py b/aab/cli.py +index 2ce6425..0956e98 100644 +--- a/aab/cli.py ++++ b/aab/cli.py +@@ -89,7 +89,7 @@ def build(args): + total = len(dists) + for dist in dists: + logging.info("\n=== Build task %s/%s ===", cnt, total) +- builder.build(qt_versions=qt_versions, disttype=dist) ++ builder.build(qt_versions=qt_versions, disttype=dist, modtime=args.modtime) + cnt += 1 + + +@@ -146,7 +146,7 @@ def build_dist(args): + total = len(dists) + for dist in dists: + logging.info("\n=== Build task %s/%s ===", cnt, total) +- builder.build_dist(qt_versions=qt_versions, disttype=dist) ++ builder.build_dist(qt_versions=qt_versions, disttype=dist, modtime=args.modtime) + cnt += 1 + + +@@ -204,6 +204,12 @@ def construct_parser(): + default="local", + choices=["local", "ankiweb", "all"], + ) ++ dist_parent.add_argument( ++ "--modtime", ++ help="Last modified timestamp", ++ type=int, ++ required=False, ++ ) + + build_parent = argparse.ArgumentParser(add_help=False) + build_parent.add_argument( +diff --git a/aab/manifest.py b/aab/manifest.py +index fc0038d..355e370 100644 +--- a/aab/manifest.py ++++ b/aab/manifest.py +@@ -49,10 +49,11 @@ class ManifestUtils: + version: str, + dist_type: DistType, + target_dir: Path, ++ modtime=None, + ): + logging.info("Writing manifest...") + manifest = cls.generate_manifest_from_properties( +- addon_properties=addon_properties, version=version, dist_type=dist_type ++ addon_properties=addon_properties, version=version, dist_type=dist_type, modtime=modtime + ) + cls.write_manifest(manifest=manifest, target_dir=target_dir) + +@@ -62,6 +63,7 @@ class ManifestUtils: + addon_properties: Config, + version: str, + dist_type: DistType, ++ modtime=None, + ) -> Dict[str, Any]: + manifest = { + "name": addon_properties["display_name"], +@@ -71,7 +73,7 @@ class ManifestUtils: + "version": version, + "homepage": addon_properties.get("homepage", ""), + "conflicts": deepcopy(addon_properties["conflicts"]), +- "mod": Git().modtime(version), ++ "mod": modtime if modtime is not None else Git().modtime(version), + } + + # Add version specifiers: diff --git a/pkgs/by-name/aa/aab/fix-flaky-tests.patch b/pkgs/by-name/aa/aab/fix-flaky-tests.patch new file mode 100644 index 000000000000..948280c20b7a --- /dev/null +++ b/pkgs/by-name/aa/aab/fix-flaky-tests.patch @@ -0,0 +1,75 @@ +diff --git a/tests/test_legacy.py b/tests/test_legacy.py +index 33790b9..0577262 100644 +--- a/tests/test_legacy.py ++++ b/tests/test_legacy.py +@@ -101,8 +101,8 @@ gui/ + sample-project/ + icons/ + coffee.svg +- heart.svg + email.svg ++ heart.svg + help.svg\ + """ + +diff --git a/tests/test_ui.py b/tests/test_ui.py +index 0774672..3764fda 100644 +--- a/tests/test_ui.py ++++ b/tests/test_ui.py +@@ -60,22 +60,22 @@ def test_ui_builder(tmp_path: Path): + + expected_file_structure = """\ + gui/ ++ forms/ ++ __init__.py ++ qt5/ ++ __init__.py ++ dialog.py ++ qt6/ ++ __init__.py ++ dialog.py + resources/ + __init__.py + sample-project/ + icons/ + coffee.svg +- heart.svg + email.svg +- help.svg +- forms/ +- __init__.py +- qt6/ +- __init__.py +- dialog.py +- qt5/ +- __init__.py +- dialog.py\ ++ heart.svg ++ help.svg\ + """ + + config = Config(test_project_root / "addon.json") +@@ -136,8 +136,8 @@ gui/ + sample-project/ + icons/ + coffee.svg +- heart.svg + email.svg ++ heart.svg + help.svg\ + """ + +diff --git a/tests/util.py b/tests/util.py +index a682bcd..a4aa7de 100644 +--- a/tests/util.py ++++ b/tests/util.py +@@ -40,6 +40,9 @@ def list_files(startpath: Path): + ret = [] + + for root, dirs, files in os.walk(path): ++ dirs.sort() ++ files.sort() ++ + level = root.replace(path, "").count(os.sep) + indent = " " * 4 * (level) + ret.append("{}{}/".format(indent, os.path.basename(root))) diff --git a/pkgs/by-name/aa/aab/only-call-git-when-necessary.patch b/pkgs/by-name/aa/aab/only-call-git-when-necessary.patch new file mode 100644 index 000000000000..1bc0e327d95f --- /dev/null +++ b/pkgs/by-name/aa/aab/only-call-git-when-necessary.patch @@ -0,0 +1,14 @@ +diff --git a/aab/builder.py b/aab/builder.py +index 5c3805c..a181b27 100644 +--- a/aab/builder.py ++++ b/aab/builder.py +@@ -67,8 +67,7 @@ class AddonBuilder: + self._version = Git().parse_version(version) + # git stash create comes up empty when no changes were made since the + # last commit. Don't use 'dev' as version in these cases. +- git_status = call_shell("git status --porcelain") +- if self._version == "dev" and git_status == "": ++ if self._version == "dev" and call_shell("git status --porcelain") == "": + self._version = Git().parse_version("current") + if not self._version: + logging.error("Error: Version could not be determined through Git") diff --git a/pkgs/by-name/aa/aab/package.nix b/pkgs/by-name/aa/aab/package.nix new file mode 100644 index 000000000000..146fb2c89af8 --- /dev/null +++ b/pkgs/by-name/aa/aab/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + python3, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "aab"; + version = "1.0.0-dev.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "glutanimate"; + repo = "anki-addon-builder"; + tag = "v${version}"; + hash = "sha256-92Xqxgb9MLhSIa5EN3Rdk4aJlRfzEWqKmXFe604Q354="; + }; + + patches = [ + ./fix-flaky-tests.patch + ./only-call-git-when-necessary.patch + ./allow-manually-setting-modtime.patch + ]; + + build-system = [ python3.pkgs.poetry-core ]; + + dependencies = with python3.pkgs; [ + jsonschema + whichcraft + pyqt5 + pyqt6 + ]; + + nativeCheckInputs = [ + python3.pkgs.pytestCheckHook + python3.pkgs.pyqt5 + python3.pkgs.pyqt6 + ]; + + pythonImportsCheck = [ "aab" ]; + + meta = { + description = "Build tool for Anki add-ons"; + homepage = "https://github.com/glutanimate/anki-addon-builder"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ eljamm ]; + }; +} From bd0b9dd21bde2b2c61650866df62322ee54c4c28 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 23 Jun 2025 08:49:29 +0200 Subject: [PATCH 02/61] ankiAddons.review-heatmap: init at 1.0.1 Co-authored-by: June Stepp --- pkgs/games/anki/addons/default.nix | 2 + ...vite-style-to-anki-review-heatmap.js.patch | 26 ++++++++ .../anki/addons/review-heatmap/default.nix | 60 +++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch create mode 100644 pkgs/games/anki/addons/review-heatmap/default.nix diff --git a/pkgs/games/anki/addons/default.nix b/pkgs/games/anki/addons/default.nix index d602b1ea877e..7ee40d038d4b 100644 --- a/pkgs/games/anki/addons/default.nix +++ b/pkgs/games/anki/addons/default.nix @@ -14,5 +14,7 @@ reviewer-refocus-card = callPackage ./reviewer-refocus-card { }; + review-heatmap = callPackage ./review-heatmap { }; + yomichan-forvo-server = callPackage ./yomichan-forvo-server { }; } diff --git a/pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch b/pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch new file mode 100644 index 000000000000..9af61f3989d9 --- /dev/null +++ b/pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch @@ -0,0 +1,26 @@ +--- + src/web/main.ts | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/web/main.ts b/src/web/main.ts +index 389c7fc..0b7c702 100644 +--- a/src/web/main.ts ++++ b/src/web/main.ts +@@ -29,8 +29,12 @@ listed here: . + Any modifications to this file must keep this entire header intact. + */ + +-import "./_vendor/cal-heatmap.css"; +-import "./css/review-heatmap.css"; ++import calHeatmapCss from "./_vendor/cal-heatmap.css"; ++import reviewHeatmapCss from "./css/review-heatmap.css"; ++ ++var __vite_style__ = document.createElement('style'); ++__vite_style__.textContent = calHeatmapCss + "\n" + reviewHeatmapCss; ++document.head.appendChild(__vite_style__); + + import { CalHeatMap } from "./_vendor/cal-heatmap.js"; + import { ReviewHeatmapOptions, ReviewHeatmapData } from "./types"; +-- +2.49.0 + diff --git a/pkgs/games/anki/addons/review-heatmap/default.nix b/pkgs/games/anki/addons/review-heatmap/default.nix new file mode 100644 index 000000000000..933a1ee1c290 --- /dev/null +++ b/pkgs/games/anki/addons/review-heatmap/default.nix @@ -0,0 +1,60 @@ +{ + lib, + anki-utils, + fetchFromGitHub, + esbuild, + aab, +}: +anki-utils.buildAnkiAddon (finalAttrs: { + pname = "review-heatmap"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "glutanimate"; + repo = "review-heatmap"; + tag = "v${finalAttrs.version}"; + hash = "sha256-CL98DYikumoPR/QTWcMMwpd/tEpKLIDVC1Rj5NEvWJ8="; + # Needed files are set to export-ignore in .gitattributes + forceFetchGit = true; + }; + + patches = [ ./0001-Apply-vite-style-to-anki-review-heatmap.js.patch ]; + + nativeBuildInputs = [ + aab + esbuild + ]; + + buildPhase = '' + runHook preBuild + + # Work around missing icons + mkdir resources/icons/optional + touch resources/icons/optional/{patreon.svg,thanks.svg,twitter.svg,youtube.svg} + + mkdir -p build/dist + cp -r src resources designer --target-directory build/dist + aab build_dist ${finalAttrs.version} --modtime -1 + + # build anki-review-heatmap.js + esbuild \ + src/web/main.ts \ + --bundle \ + --minify \ + --target=es2015 \ + --loader:.css=text \ + --outfile=build/dist/src/review_heatmap/web/anki-review-heatmap.js + + cd build/dist/src/review_heatmap + + runHook postBuild + ''; + + meta = { + description = "Anki add-on to help you keep track of your review activity"; + homepage = "https://github.com/glutanimate/review-heatmap"; + changelog = "https://github.com/glutanimate/review-heatmap/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ eljamm ]; + }; +}) From 71b2f8cd5f604a699d3527596b3aaaf610d61a50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Aug 2025 00:35:40 +0000 Subject: [PATCH 03/61] libcerf: 3.0 -> 3.1 --- pkgs/by-name/li/libcerf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libcerf/package.nix b/pkgs/by-name/li/libcerf/package.nix index 4e34cc1a1a6a..8e49899bed6c 100644 --- a/pkgs/by-name/li/libcerf/package.nix +++ b/pkgs/by-name/li/libcerf/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libcerf"; - version = "3.0"; + version = "3.1"; src = fetchurl { url = "https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v${version}/libcerf-v${version}.tar.gz"; - sha256 = "sha256-xhCPvaia839YgRnAxUK2wegkhFo2vqL6MfftLMGiRts="; + sha256 = "sha256-TAfiqOK00OTUjbng/JGRtDoOEg5XfVXYfibe6HRcb6s="; }; nativeBuildInputs = [ From 7404c06f3007ece43788ffa5941a97ab8b559e9a Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Tue, 5 Aug 2025 12:38:37 -0400 Subject: [PATCH 04/61] sudo-rs: add pam.services.su-l for su -l --- nixos/modules/security/sudo-rs.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/nixos/modules/security/sudo-rs.nix b/nixos/modules/security/sudo-rs.nix index a157bfebfab7..7fa795270b8b 100644 --- a/nixos/modules/security/sudo-rs.nix +++ b/nixos/modules/security/sudo-rs.nix @@ -298,13 +298,20 @@ in environment.systemPackages = [ cfg.package ]; - security.pam.services.sudo = { - sshAgentAuth = true; - usshAuth = true; - }; - security.pam.services.sudo-i = { - sshAgentAuth = true; - usshAuth = true; + security.pam.services = { + su-l = { + rootOK = true; + forwardXAuth = true; + logFailures = true; + }; + sudo = { + sshAgentAuth = true; + usshAuth = true; + }; + sudo-i = { + sshAgentAuth = true; + usshAuth = true; + }; }; environment.etc.sudoers = { From b66de0973ddab400115f162dbc816cf64e5f1998 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 11:48:15 +0000 Subject: [PATCH 05/61] log4cxx: 1.2.0 -> 1.5.0 --- pkgs/by-name/lo/log4cxx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/log4cxx/package.nix b/pkgs/by-name/lo/log4cxx/package.nix index 175bdb5d471e..56965768132e 100644 --- a/pkgs/by-name/lo/log4cxx/package.nix +++ b/pkgs/by-name/lo/log4cxx/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "log4cxx"; - version = "1.2.0"; + version = "1.5.0"; src = fetchurl { url = "mirror://apache/logging/log4cxx/${version}/apache-${pname}-${version}.tar.gz"; - hash = "sha256-CfR0iqVnXvXAdwvtv14ASIZokzxak1pDrFuFviQ2xIo="; + hash = "sha256-qiP0fDFkqiz4SMIli0tLw3Lnlk1KPtR8K0pKkVxd+jc="; }; postPatch = '' From 7bc86a44d0de082486b67bc21db286929a54193a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Aug 2025 15:58:52 +0000 Subject: [PATCH 06/61] llvmPackages_21.lldbPlugins.llef: 1.2.1 -> 2.0.0 --- pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix b/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix index ba1afd633fa6..eb4fe6753ee9 100644 --- a/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix +++ b/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "llef"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "foundryzero"; repo = "llef"; rev = "v${finalAttrs.version}"; - hash = "sha256-gbZDs3uurmi5YrnjumjQgzKhEumphvgYMk3R73vZiUA="; + hash = "sha256-pAFjLaZi4Sjlq3evKT2IG+0/imf4Fp5bM2gknLKpRvs="; }; dontBuild = true; From 198a30ffaa961bd5992ca9f77ab54f546a4a7ad7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 14 Aug 2025 22:25:21 +0200 Subject: [PATCH 07/61] protobuf_32: init at 32.0 --- pkgs/development/libraries/protobuf/32.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 11 insertions(+) create mode 100644 pkgs/development/libraries/protobuf/32.nix diff --git a/pkgs/development/libraries/protobuf/32.nix b/pkgs/development/libraries/protobuf/32.nix new file mode 100644 index 000000000000..6e01d419168e --- /dev/null +++ b/pkgs/development/libraries/protobuf/32.nix @@ -0,0 +1,9 @@ +{ callPackage, ... }@args: + +callPackage ./generic.nix ( + { + version = "32.0"; + hash = "sha256-kiA0P6ZU0i9vxpNjlusyMsFkvDb5DkoiH6FwE/q8FMI="; + } + // args +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82f13ae44c9a..5bedb82a6d4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9056,6 +9056,7 @@ with pkgs; inherit ({ + protobuf_32 = callPackage ../development/libraries/protobuf/32.nix { }; protobuf_31 = callPackage ../development/libraries/protobuf/31.nix { }; protobuf_30 = callPackage ../development/libraries/protobuf/30.nix { }; protobuf_29 = callPackage ../development/libraries/protobuf/29.nix { @@ -9068,6 +9069,7 @@ with pkgs; abseil-cpp = abseil-cpp_202103; }; }) + protobuf_32 protobuf_31 protobuf_30 protobuf_29 From de628424d8346c5e06d80cc2d84883832d45e46a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 15 Aug 2025 20:46:07 +0000 Subject: [PATCH 08/61] age-plugin-fido2-hmac: 0.3.0 -> 0.3.1 --- pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix index 1c3a3d012818..98285b117d45 100644 --- a/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix +++ b/pkgs/by-name/ag/age-plugin-fido2-hmac/package.nix @@ -24,16 +24,16 @@ let in buildGoModule rec { pname = "age-plugin-fido2-hmac"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "olastor"; repo = "age-plugin-fido2-hmac"; tag = "v${version}"; - hash = "sha256-DQVNUvKUyx1MUpWy5TeL1FYM5s8eeoNnNjKYozVgAxE="; + hash = "sha256-f/Ld4bc+AWLkuVbL0zKEJNVqA8qJeRP/zF3jyHs3CQg="; }; - vendorHash = "sha256-/H4zHfaRw2EqV8p57Y1Lgb2N1VXBucetvl7mJ6Jdu/8="; + vendorHash = "sha256-pWa0PWBy32eIayKwB6Y6TeEBMt/GXpFzWJANUvvTie8="; ldflags = [ "-s" From b7b9a858327645cd58fd485b92a3af9c9a185c1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Aug 2025 10:30:44 +0000 Subject: [PATCH 09/61] level-zero: 1.22.4 -> 1.24.1 --- pkgs/by-name/le/level-zero/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index e921448cddb3..2f6651fe5438 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.22.4"; + version = "1.24.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; tag = "v${version}"; - hash = "sha256-9MZcxpRyr0YMLHKTgxqJnm72rAYLkTdrn7Egky8mM48="; + hash = "sha256-mDVq8wUkCvXHTqW4niYB1JIZIQQNpHTmhPu3Ydy6IyQ="; }; nativeBuildInputs = [ From e09bc73e667edbfd27dbedd05c1486556d717934 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 12 Aug 2025 18:13:52 -0300 Subject: [PATCH 10/61] dotnet/update.nix: read artifact RID from prep script --- pkgs/development/compilers/dotnet/update.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix index 41df7569be19..fbbac2845c4b 100644 --- a/pkgs/development/compilers/dotnet/update.nix +++ b/pkgs/development/compilers/dotnet/update.nix @@ -124,13 +124,16 @@ writeScript "update-dotnet-vmr.sh" '' gpg --batch --verify release.sig "$tarball" ) - tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json + tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh artifactsVersion=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsVersion)) | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) if [[ "$artifactsVersion" != "" ]]; then - artifactsUrl=https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.centos.9-x64.tar.gz + artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh) + eval "$artifactVar" + + artifactsUrl=https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz else artifactsUrl=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsUrl)) From 90227a2bcc63fa7f111a599e4c236fe6417ef8ab Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 13 Aug 2025 00:37:55 +0000 Subject: [PATCH 11/61] dotnetCorePackages.sdk_10_0-bin: 10.0.100-preview.6.25358.103 -> 10.0.100-preview.7.25380.108 --- pkgs/development/compilers/dotnet/update.sh | 6 + .../compilers/dotnet/versions/10.0.nix | 431 ++++++++++-------- 2 files changed, 249 insertions(+), 188 deletions(-) diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 46486f9e309a..132ea56874bc 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -220,6 +220,12 @@ netcore_target_packages () { esac fi + if versionAtLeast "$version" 10; then + pkgs+=( + "Microsoft.NETCore.App.Runtime.NativeAOT.$rid" + ) + fi + generate_package_list "$version" ' ' "${pkgs[@]}" } diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/versions/10.0.nix index 3b43dd48e172..694ec7c5fb0d 100644 --- a/pkgs/development/compilers/dotnet/versions/10.0.nix +++ b/pkgs/development/compilers/dotnet/versions/10.0.nix @@ -11,28 +11,28 @@ let commonPackages = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-DF9lEJjcAAcQtFB9hLXHbQaLW82nb4xlG9MKfbqpZzIQfidqcAuE2GOug/q6NNDcw+N88J0p0jKPz+k3qKmAKw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-ZedqhbGvDx8Ajn1N9SRKq4q/m7rIQdPmcvQS7WOaijpqqjNa4P4zTd1kx+/kb6a5FJ6thD6yt/hEADTGpUpflg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-SV9nyI2/sg7Rh3f01eDScmjKYuuzI6xPX+iknl2zsecspqYBlWcPN1SvMDlaD/sK3GG5jl3hrM/GcOIqMpoFJA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-OcQqR5UG3AFa0aQNIRTB3acRpQ+OhuF8ZpLIQM3xp+egvzzKRP20jja/gWhngIVtEA012XxLiNxJrHhzWhtLhQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-npMO7GioGKn0FigriTOCsi4HgSENnW9YRJYXhyFtCGLR7b71FDLVY8nHemM0XYm9lI0tH23N1EwcDFyzHTDuNA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-1UT2fr9kFvdpRb3+h3dTmGTnhKTvGKpYFRQuZUD8ukmaQ9ABhnXp35E8GJoA6d6pOERiRnhimzrVg/X3B4znUA=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-zDr+tWvnlB9iEwnAlfa3PW/S1/0nw1lhvXBWghgE6o9O5sxc35V3aobPAs+Cm6DTN+lvNMouhjPt6pn2t4PvQQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-Eekoq6ATo+jeIsK0GafnGK8XkdjKtdOVT7deD1TWo04/nt0KV7nOmBUOhwUKY1sBsjvTQvOoDthn505f74N3Vg=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-W1yNC4+7vV1XPSXJx7HFsvFCi1C1XZ7QVlfbu+xq4pt1/0cVJGZaRlbwBNUAv4PAdg2JGM4VYtcr3ZreOJ1hzA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-pX4P7NG1jHIRJrbHrVP/MvDyA89o7HeuKucToiIH6flQ5ixTntZJupIW5qg2wsScJOltfP3A7j/w6MTRA9dHOQ=="; }) ]; @@ -40,118 +40,118 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-IKe0SROzAWJiFZyh2KVmTU5i8ddcEqvr5NIr+3RfzvBEYa3SNBbqy1W1x0TR2aEvYgSqxKSohhs9YVSDlrlx0Q=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-ekrR6F7cC48jWc0+Fyv3emOc5bkuv+yvKg2ZDjuv9gRf6e8zWGG6PkXKkPuo8sxHacPucgc1bIibVgVGJi20VA=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-5h33Uf2vFcjVkeNRD41YiERegQ7twv6sljYAMtz/kIHcIk90aB0ztZoKXXVi+vNxma7q/f5oPxhzUVidZ3vw8g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-QUg7nZopW/0+Lnk4VeNHF3Ov3I6IuqsDSbvkeEDWjWyNXyOnJzDErKN3d5p6jWdmc3jjndyOw1137vaOKV5apA=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-yImkb4fnUJIXR2Me5N8eOrX7w9+u8SAAIp8QtlWdZ6WptjG6PUByTs2hjTfX/aVKjO4p1dmKTaWJ0qYR6yuDEQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-k9W3fq0DjcbjxuveOQd1ou8fsHhNH/zHayPE9b1VRj2CijLx8krGGKkP3gUR7jLbOE+o9/Xln7cEsWzRBb9tdg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-1FIBZLtWKIxULrRjLrldz6kwVSoAIf72kXKE0WgXECVez98NbQXLEM90hfpHj0LcQfzqOoP9kY48yRSoXp+rXg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-+zsgGnlZS6MdL/uyvAQAN0KAc8Vk1qT8ylHCi+iwUXqwslSGtZQku+qGvkd7hjMMnEbnSa5j7xJY4PNGDbco4Q=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-eMokXhxbTVJUHwlAhM1dVZmjljs/s1nRfvrJ0AeJaTbetXnD63Fd6sQeMmw/EifYnpdtxr/gIJRHLPsuLNDcAA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-+LG/u+Jp6b3Oyud1QYP3nph1uqtx4rhPbeH65leIMSFQg6bB8Jd9g4hNwESllHd6iKpKP7Sp17VxLKynzxwHDw=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-qw5Xb2+l14q+2OSesjwGn3gHpdFj0wUeA3RLEUaljzW8FF5HD78B6t1YuhFJhcENuDNAv5d8Fcy4N1mG/RQZUw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-BE7hZwP4oZ5Xacmhjwc3Ciy0KJKOXwg9NJiBVzFv7xEJ7IqVceP7kAdMPsMNoojwz2KNs9gJdCOGOLtwyeTZyw=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-Etq6qbPIzEV8Z3+w0C1ibreDduKkAF1zZOGfvcBz3sjAC9sWs/qflxfKGZ7tBKhEV/A3vZWKNGyxYKnawCtC3g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-oskWoBpDhGI4WBOJPFTBIirjUdSs7hvHKGuz8OQmrByyv8C3rY9jtt+sM45uqINoGNyYsgbUQkQlKFhIB+mT+Q=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-SINZNHzxrKbgD7VGAx9GDMIlMOmXSpqWIeLpmNpPTm2D7F+NfXv2lVLxLl0nLUAJ70ipI51HdHGyrKXTOaFO8g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-+/apDtwjBvmEn40DJ4yPOYqCsgIfhrD/zPYY15A6ny5kN1n6uV8LgUce9vv2HatRsD4uOuepD2z22/TbB8GjLA=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-t2YTlMAHq+V8K8TnsFhUudCqiV5CElb/dk2tFmZ61Td4gyLY/iz+4q5lvpGAZOlCFddTtublSbIC3n4EH3liEQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-+uZHCjs+FlbFU2StjeANC3vvYjWd+6PlhIX0F8sHS60u3U9/HEi4JECQ0vhak5ODJCi+wktEKZQ53DwGAvPbJQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-lEaH55DO++s5EKEHfODZkF279HI5DROQgaTif93wcMg9mhL5kPHnLhi9S7qTMFKt+GQfmZWMlwZd+L6GVz+RVQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-mtm6VWoDGYg7qlqF6sFlf8LBEbGOL6ZCSoqzZ7hmDBy9UIe0AswL0d+AhsDOE5ewHifbK+vGqXeK83ZdL/1IRA=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-zuh5p3Hq0ejcgbCe3IaVOj+mItbRve25QdIXaGirOfDuO2a5fGXSO8RtgFosw8ar2jBSG3qL6loMFqqgkiEuVA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-/X/ugPn9DMhWz26lDvuSlBqX/s56B7Sl/Qkd2/Jy5iYw64+9tOFo0Xh4kz0fF5nOj1H9RbKxIaNfPVc41rxvIQ=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-Ivl/uKKvVrgGxfbC8SSz5N1NZRi39PQ5ZXfsECiSsiNR2ls02Wy2Icy5mLRUGCFY4FMILAKsgfJRKejafqGxyA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-/SiUD5N7pwkJ4mK83CBkre6oOB76BTJ7lJUTDDw3t8F6HUJS+3i6Cx9sODd7BS7TXXA5ahql2gcfohVsaFsR9Q=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-zTiRlyK4ElT/MES3AX1bLRcuX3lY3NXlwL89YTyEjuHrqjCpxEbHfsoznqYd7zLAF1itzvNnxDkqDPoXat/zZA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-WKqXIohGOzMUpDOsAEpknxj93fSuTzSdP7X/Ud19dggmqwPKMIWN5NZpWlBLdyP8+NMwLyNM/aR4uCtNf7MT2A=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-sSi6F1x2UVJe5Jp8RbURsNGVxFFPyxq6P8ZlV6r9dimYM2KkDyEOtcZ0hHSOtmMU3rghzZYksvSKv7+9fAYUNA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-GQokK1ugeF0JQi0IfkyNDm5nIVCKpH6V8zSskBRSAH8O5U4iVImpDkqBg1icxUFIAaVyiMi6GJB0CkTD2cC+yQ=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-Qj4yn5t5k+lGY8dBPwh0jLQOXoilcVvwpmyxJp8LJHoOM8EmGjRoiCy68sRXGTQMt5d3iNIdV93rX+fXu20rlw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-X15A3yBhigC8T81Ut1Zqqay9HzfCjjwLh1QDbHL2XggIWiGzkDf4hSX7qnkbki12DdFZP5p0xDFiYsnEBTGNgg=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-b26YbRN+y0LrdVq32iV7gUmi8sY4vY+P8GvaqiPTcJBH20OSfrsvDhyM08qMs6hCDo17xL5hFdLt9BSBfqcrOw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-vNMheP+ysMxIiINElw4ebu7O8KHDz+l2dYTlP9zfBllo7eJW3XX0k7kOP0nYke78KFhheXu2JUHAAEZVhazOUA=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-IoNNvrZ/pKBwn/XSvDp1saM2XHk1ZOKxrA4lDyrL10/s4IS8hRo/Yv3qs+ihWpwVStORW3lh0YIxQhMDHbMkzw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-478qsicUIxQcpq/UGGoNNLRbUldl34RRZqxDdRl1HqC2D4aUdCpR3MEU5vd0zcbHxkegfPfgQgsv6xfIt+k/Ww=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-/D+xqMtDuo8ji4FPJm5EsEORBGEsbcHHYIjZDiEHP7ltIexg/oOSwuyvepvV+mK46Q4uyQU9zuBVZaG5FdKU0Q=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-fDGfrQnqXasfMLIUs2xVvLNxWjN0w7HypZ22wYG0y8PkN8u3vpVIQz9tYgUgEXvxKpFLYq1L2EcxksY6reAWug=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-kEXLQCzNVAnwkQ58qiO7lUOuO6WJSMlNmnQxx5o1RTiMIoqrgfjMazn5bpL5DPeZjMhWcB4kary/3Vkj06xRtA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-WE52ljXg7k8/ry1wBJ7lqrKniEZgwpMtuf7m82tMtuc30k5X+1nAbOa2evezPgjsXrB3k78uertzT+GoSRX/fQ=="; }) ]; }; @@ -160,361 +160,416 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-z0RiU5O+4aelPS7+JYakKFXrmczOzTYp5sptrRoz8H2zM0Tbvwc7sX3pT2F5ZosBEaub37XJKrwSdvpdHoe6/w=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-TY4LXwPBf9d0vOpzCkV8Ze9e/Tnn4V07FkSctLB6Vc6XreNkVqEQcB1TuUQZOFc7pXBvpImRAD5mAfuLVNohDA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-CRQl1RVkbfaLnYOEO4ApZ6Py1OG8zJjwU0UkAcIhg7MqsGgZcathISOzlDYayxqdbp+Gga21aaJJZbL0TSPkdw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-UBWg0zDyYiiy3wXtxmRqaoAvi2hpXGGJ4VxoKcqgD927ftcYXz80g5dFDtk8zof3CVnfXHgaDCm40jxOrYU3qw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-UjSZtTgg1EEmNJeI+Esg2pMNjSb+lCy0VjwkUIVUJA6vezRNsb66NjsO5h4rvSMS2VhoKWGc7jbNV1AKRj891g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-ZHAexbNsU0DMvR9vVqYldw9m+wyqLM5AVZyx6E6Lgk5JzjgDI9rFfDI2h+UGi1WOJyKPDKrjyLWG5phtGC6ytg=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-h8mVEj/5JRPzKcDpoHvnQ0wt7nn7+euuPKLDtWH4yiAWztH8CX6udfHqjIE103USfpfMKEEcEWRqOe877rgp2Q=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-HmKdrzhgbW4ikm6lKWgaBm5OokH7aPyGuaniMHvRKnHSeUxDYMj2PU/ZSIlIxTntxELeTBd+ZcJlknJqR7Duuw=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-3WlHMaSa60X/owt47VYhN/RYy/98jKjoQtzW/FoZUfc0E3aCN3pJeUGbEq9NrNLfu0XbEriwTuwVG6zyI0rr8A=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-rXmRirmXSlmvrc4lY76+eK6UoXIi78sUSDggleEYs6Mwip1PWWQ1bg2Bi3tpxcRgF1MBOgHhiz37lybWaS1y7A=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-bPfmwsqmA39Vfa+Uu9mH1eaCJZo/qd+/O0aOYRhjSrypYBQK2AIif8lq7zYxhOR2U5AhvkkeqLNnaEC3spTHiA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-sw5cXyvNbbXyDkmnPJqNgSnOeDFdl9VL7OfA4kA2GcPCujXhnElVmF48rwibVtoYmDUe940zKPjUAeuXmmOH+g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-OSpFCcAHBwfDK4bY6zNDfbtY+fKY6koEgvfVyk6OtdUI+dOM/Jjw9Kyxiqe1S8JC5dm3366+AFdqF2ZWbMW4fw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-BYeSSlt4ck/kK7L9I+OYdI+aklnF9JDNaHyIQ+nea+E/e6qqENxlgDPzJKwTKAX4XdIF7Rc/Gk14PuYBpC7+Ew=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-gFoRuWxJUSjqz8meGfPQhK/xI8LXK0/z2mOiVWfwFBO1lMuPUWFrzlUvoPBHhZSYj7578iHtUog8r/tnnK6+Bw=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-poxX0QwFAsVfHDfH85V0BVd5dEtlhr+/3rPhCe5qhkFscmUM31BcD1ABbzdxYt/PRJKnKMCCA/tOHhMU5rUieA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-BLvup3LOAkOw5G/xJ0j9pcTNNQuPLibW0u5bTVAmMYYZny8b39xNWWVqNQ8Rl5jewPko/8luoany0SbHZ+GUpQ=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-koC5WN2WuOaApo6XSGjcdWKUhR94/7vZUiQZ9XKemdGJ2rpjgAhGvdQr0PcNqyTUDd+vC6LOsWjwwqg2GSHYnw=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-kPsplrPdJ9VmThmB0kXTumkVG0WikMbkSRzGVyNU/Ploa9Cvv80PnCxF5VBAqRV1l/l3qBq9TZQV+7c6mIef9Q=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-2NeuUX5T7ZRuc76byZXf7cLXYTK5fGufEbrjEXRlBMXyI+vQ8x+6BR+hbqef9JGylT8pcLv+xL11Gx39vk2KmQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-LOoGtTUAg4/m9912v1s4yvh/wx64gRW6+052ZpHphizEbI/mvy5MGZpxS/WQHX34+RDXIG90CpdT7caL5iC1JA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-iZO21GJ4K+PjcH9Gn/OUVQrBkkfCVCifO+PsQItVuWuenEOwAShzCfz8E5icd/INLIosoriCyRV777jpjxHZXg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-t10QcEDpbrSvoe2BhUCtqOAqfXayzy9uujpiIeAdOyptGmBppA37G+F4cCRsIx6wzhCSrdPkYoh1KzD4rqqlyA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-SAKw8xQa/VBWOumG7JmId0UIKUs2RM8tnl3KPXJ85mjnrrP3wJLWynNf6v/hMxdxqjAOIb2Y6AIGwK4zFzA97g=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-ykHn7VUDn711h67XQd+nx5Tn0L0vYWQY8kKWqqTXm/mBEM5CjoMd9qft6jirusGORVxC5RAnUENDt5n48B4xfg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-PTVNAmlIQRHnMCcw8Pm5+t8eLLtwyZ1J6lUjTcZ68dU9FGXIySRr750lekvMpBugMjmXIsNw0VQvg9AnL5SIDQ=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-cMnylrJR3P9phPos6bJJDinj8YO7eSeYxUijvcDHhGPXXzpD2aTZh2anv7WOSB84I21xKCpyjjgdhcdPgTCyJQ=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-6G+05BJAEjErJMixdkEAndBjgaCe7WmasdRypKPtYRfzvPVExrq/nak0ZiaJ0Dd3WuYdbi69Qyeuhj7atnAImw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-VbIqcklAsQYAAV5CTXo/6NAa6lkirCeh1XF7Yo2D6xZmkwLbQsKfNF1jpiwYr6luiVwJCkIA6p/owsPAZT42gA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-xjepU2UUYCP30YJHPdX0PN6C0ZqP2RKAEsJWpnNSlYQ8fcDHgy+l5ZTQPBD4egfWKlPCEtgSZod3p9nTggSoDA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-H5a0wdzBU4tWXtTkYcgHsezWolqD59sDLSlDdOGE/OF7p3X1AijCo1BKCb/ub+Qn24dXoS7RGQf4TwmPP/fDdw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-NORvYn5NilmBCZzLwrWXEPI7WeEKKwIHzh5USjQHQLsSoiWcOSZVKQLkqK2baSFjGktLyHmHRUQ6VnTggDuPeg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-DpKE33FA9NYJXAY5SbKcIfAvU5RyH30YqhCXxHi/NYfEcR6e5hrzn4992S6TpUQzeYHeJHprfXEQGK+x8bWTqg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-tMM7GajJVqT1W1qOzxmrvYyFTsTiSNrXSl0ww5CYz/pKr05gvncBdK0kCD9lYHruYMPVdlYyBCAICFg1kvO7aA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-prERCrIwyGg735ahEDi15HwriaDnwZlQidlFkiDSOuh4EJTXLqbYvwJxSygCNIgKAivNEwt5HuqAR0WxIzxLJA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-SvUcMwIUDjSW7wIrQEChlhqEmSWIhruBP6pfvPaWu6WI4n9X6PtPvqyJp5dza77GATyc5i9sjECy8HNxRro07w=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-wUU31YeB3hCc41XTTSXbhuYKKSbFv3rQb4aO0d93B1m8xPZfUpYA121ysuwaaiPgHvFK27wfYBHAAO82d1Tbsg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-gI8nk0A8LtN/NXufax5tgmoxnAFvG9SUA+yGfBz82HlAvwZkWeQsNjZav06LsIdBgY+34oJqPfhGFWki234b3A=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-eQ28Igd0kDwNnBeaXvQul2U4Za4KTkBJ2hF5gi6/8xL8tJAIvpSiuHrcspBB7oqr9/uOU6R4eR7gDmOH0OVRaQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-6deTINJifUd+6BioAPScqa94hbH35wweO3UazZ0Dob4GFoSxD/z7jUjRIib/HmyhXz+F/QMOZapPNN+qNsmEPg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-zHJSkQl00ygE1BBWjjSZgQmT+rpX/ZoNvU3az2Vfk0D9tqM4+zQ0M0IdBw0Eu1Wr46LeifWIScp4pTvzBB0R/w=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-T93T3DT3SakSQcwaB9SFTT6R38hEh0/52bM+4IqvFAo1EAKx3eXiKezE3bMSjOGKHxKzb71Rp1d9Jflv6capLQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-RaDmfdtde+m27g31HXvBUJme7NUUT07bv5+Wp3mPH/FXE6tT8W1DvG9XNRcT2rIEDq24ktpfyBiNbN8fieBfqw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-dnHqxZvkLe4SubfrXiPhb08qkj2FOrdCBWLHo/Hd+pSop3C86rCTRJY454LrPwjnktjnQf/X0b4anadwOkckrg=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-ewu+rh/Kky08pqSvyC33WsqopzmUojhx4NZRn5bFF3pcO0xbdhOEBuZR8ZQspXA2tuKL/n9bAKWDIPsVdDMdyg=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-723qKUmFeBKN0yfsf9zhP3k5ZKqK4UYvdKbDL80oyhzm4gQZ6tsUU4fHeHjJVJfqyN+wKS+R0WthyxhA9m07/g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-8r/yMsXff3vlFUaRzlHKnkd/qxmbo6FzATU4d065j8YTNZcduF/uKiOKijwXSd96nj216RjCUIJWrcH72c5H6Q=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-hPcjYztP9miyYl+mqvTqoEqaa+fp+kCFVrROIwUEDBMNs6Urk76qsWJWE/uI9kLBh1zTHiDsWlXDiOXcftVBxA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-D6qubx3bzbfdDMJw1CcUJdPR2w2oHmOt/ur4q4Pi8cdFueROux3u2bcuurKmx2eZvHhYVKnL1njTxWDVHUM1OA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-IG7yOIrrLUvA22aUGR7g9VtXK3WGCsID9TokGqET+LoO4QTLlFRYjbrsUkvttuGUHftOTgDh+4abzkcqaTfd6A=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-neXYzUGCn4zBhHa4+9NgG6c0ulwsfGczrrH2hqJcwf16fNtBgfe9L+JnwRctrVVe7iOci/qYh69c36OlCsREug=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-3PwE2oDr4+n93nPZbHz1kgJkpdus91UR5IXKnMWMMxcEq+VgNvNpU4+M+khwPOXSmxK9LY6dsd9beQVIFtrDVg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-D8SDjyznO8H+3w5eAuL1pl+JZ+4S8eXM8gIMuNaDXvBZv43lU2by27Gk+Ue4eH5zV+462fBtBvqZtaETgfPsgQ=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-zPgYi5k0qLWv1+BGxMmZnNplAa6tAnTpibzsSQTCcSmLJfazFww4sRI4qFYZ+H8/Tc1jVyIPHu3whUL3UirX+w=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-QVYtaGiLQ0bWTiav/cc2Ps+PQ9co8EmTW8NAzlf835camz7gdjZHKo5/z4FOVUHVftCY9vn2yBuBcwceI6f+Bg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-vk6trHjpJkCveABOceuodbxeAefojPqaUCGwU6HXinNgu281I/iEF7Afj6mJBLHxaPcvlFQjAjbRhll1SwcSNw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-4ktCvzYslGK2G2CLPy4As8rbHGPtQw0RA5VC9WxRmRpDH/3cyicFbRaBRVc2y19p0tV9nMC9KdaFyptm80lQZg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-r1LB1Ilq1/Pf71SubpoHU53s5bjfHY/TLQUhG2R3AGFMe1S2J6H35pkXuCdwBH+x99AX4khX1zw00BCYP5liVQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-MPUbFdcUXGrfUpdNmcPvq+EdaBLcl+4+nsbUwftOT1041DpIUkFfDzgWNWVMjPG3Prf3K0iKPtvdKx9bdUlq6A=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-ovDMqhvYv4o6P/AjvAh26EcSs6auYHe4YBgWF7SBLgB/r1xOvjlRZRuVL7znu/js0CwTH7h8w/YvW+q1+Tzw/A=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-CtxI7P/Il0bLfPXN6ofeL4Vm4ISp3TjvRBZt8MkACaTErFseNiwIIAKNqZ+d9lIxj1MDGA5fCfVn/0PsGIksRg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-K7jCpNm0lYr/dHheLoaPadsd9q8oQ0X+iK/rJkeKrZ76FLzAvcC1FqX9yXICwAW44m63bXcmg0ggra1+yXx0/Q=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-HAloa6WZYn4LvTyANZMWs9l5q8NR0Bqvs7pGKKarpE2JnmlH7R371+nMg20Ejxw9UYp0SNNZ775dw83G/WX/oA=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-p18BC5bG9/0ktSBUvxZOqPpr9qkS0Z6G71GViCAzjtV+fBllt6OE7T0rSvOZ14FjZFcSqMA2HZ60I3H93cK6TA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-R7g8lya69aqDY/iAIIoX8TnbxEJxBIxvuqD0zrcEuJgRh33b2xys9OAT2NmyZH3GWdTZ5UPiolJ2SifKNE1ztQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-T9Rhlb0Ivsaev2JNEKRLRoc5pyowBy+meS7GzijwfHOEviRw2rMpPNK+8DoygI8HRetSnjLghMlzdcfURF10LA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-tPbKNB5TVRIAHyts6RMV2AP7pnmO/1MRtfTByCqTkTjH945dJ8+2r4ytMIoQ3ooVLi00yll9w2tDL+XnuNT3xw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-7SI6G+CVFjxrcgJny64fmvOp4Pz02EXrhlKJdEKoht+enh8c/1pY55cgR5jq9GWJ9iJNtV9/sDUiADK74NWWKQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-W18K405wGThiTnn12Mi0K6KXznjPZX87mX9APiq+nbKIsMmGC+r7cyIPgy9hmggnTb3qqv1p/0PACRD6NXm0CQ=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-ui1NVLgK7tEN1Xv+MO8FRovfg1OR4sKGf5GXHz2CN88GLkzznp5m9sSAETN2IPueRV+aaQ8JFaLEEw1QOdlh2Q=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-K7fKG8YuufAgq6VcvotJH/D4uHmcjg/X9TwWq8EmbyysqyNCuMkg6a1torpyaomdooKSZ0LSOodqbo57B6jERg=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-AAcenMQyUXqNewaFwVv74m4OyOy4DH/seZDjjmMtE6BcYchYlWjJjU7Dh7lR3qk1KFuRBdeIvLHpGUZS0+GcqQ=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-kTwrqjATCL5woNksB+G2B39lOIUkxLnouFruipzLnsDKSxG50pKIhxWUkrwTfwatL/zQasE+aVlwEfSQAxQteQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-alvGXGuLfWb35dOybu83zGbH9VyIJRf17FEhF6yrNGvg8gJ3SwpU/N2uGnuxI1TIb8dFlKq3FoE2hqfxWAERKA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-86sGYDN7tFGBhAUacYgosah0TTIMT1czQtKHb6vKXOGo1wWAYa+MsGXrdUA6o3rpvybL8rbRANQ1tarIfui4Bw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-8345qvf7b3Q8hoqXErpJTWQeLmBV3GFUNa/hp8eCglnY5WWbnfd/muQAdA5zUoOX/8fMA4TILhZx2K0M8k1/mw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-VkXVbi8EbajQYu5pge5VCXxWGhHJtLivHM+rqHt78b8w2IpYfRACV7lqEU1COg9D3sZEG5oLOzKLCCN7lSiekA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-um95x3i3Jdyat4T6HTXP9I0STmsqJyuTWmZwCg/5EPNWMX1fm/OIFIoUQ9lX2kplPyq6Ys0hmiBaVcHOHGThgw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-CUdm0Uw4kGSk6oVm8QZLSwxngMFmbNoiFXve2hT0/Csu4mJe6ttV8C/Y0VLPBJr3GmoovOzMeH3coQfEf2YvBA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-LneCr0cNCIEYVfDI2Ab++j+baaKut+pqTsCb3R9FAp9pqYVXveSEXn8V4xx+N0i//SQx4i9Dkd+oYGERun9k2A=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-xgYN99ynL4a37SaZebTPpeiui+2OVxCHFfPrW5vBoqoHLvAxhM67ZpqAY3zQELjS4Kb0ZxsLfOS4OPFKbcweSA=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-kV1DnmxJrCauIvUfNe4wC4Yi888dzxxf7sYT4W/apnCSHvcjueYEZOGtoLSirsJJrn5aj9OeFVz+bAbd9nurxg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-xr4GBhH7aIMfPXjv+CuGZI3h1PZc+yETwn3/9UMOXXNxgM1zrkCR1p4I8rQNpwVPd440P8pReq2AWrdbLX7kTQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-XsP6i0SHVuDjS0IWBC+/3QXDJO+3ARuFbPSu9fRjR5NkK5/A4lQpBWJRymTzqWHzmD0DLYMEfwR+3mdG2A/StQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-slvRNr3ZPyyGLrOFEPVF91TD6BJcC7/UKrowVg0XGq37IxTeicrNLhs7PE8qmVGBgUTiKcqxEU7DXI2/qBh9nA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-UsW6m9/wuBUWM8SU/PHsn+9GQMRp4i00KfWDzE/s6rnCs40WRvy5Zcj923XMy05Bt04dhSrOOmDR1/vkydaysg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-1JBZRsQMZ4mCN0rS+F6wwP7s7+es+uwx6hG9ubUuccJYjCEAWwDg3vBVAbQqwMOF9rdbqOLFbkbvawOT7BHAaw=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-Btz15yrqllW8cQ82bDOMB+fo1ONv4j+BvpZGQTt4zwqgyxq3qznnxVHrMxiG+UUwhDlD4ajCGYuZCjHECODTHg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-8fiTrOmlVMojv2oFxSO4zKP0Mz+3HazxfqBFBbgioN+/dMNiCa6ql3Sm0kp88Qmfcb68PwhWCJLy3x3XHLEUuA=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-m4+5c4eH8FsloMih4Pl/Fuf5dVljpTasP7wzRjn5UAt2M7RdQC5DbC3ZZDTuDSIwuDVKXoLzUbDV6ui5SBJ0mA=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-bVGv/VP4T598HMR97vrcF8NxOv43rTn4RtH5JSm/Z/I2l6Jf4OsEmrP7ciCJho65xgG2NN7E80dAfv6Waan/DQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-t0G1lpmSy3Bb/0k4riHo+oT2h53IbHHC92oy3Mnxg2Nm/ZBoGDW55/maB5lF+IbEoNsScpAhsFNf7gAv5KPOhw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-OvOg+DllupzQyo2AiWJOWhd3G7sXoROVbGIbaO48l3cXJf+EkT3mwK0WyKNJo1SYDBSHP4PL3CELLyl7KeuBTA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-Xgu9wAHojyPC6/9OhNk4Bpmhmb4FAcJMMb3S7xwwPFuEx7pKSCPOA/3Gv/8xR3w3lYoMhvs94Jn4zzLPw/d46A=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-di/eQOCbK7Gckc/GaFEJbeHA8xc1sjPYb4ZgSDQG8s/lSc5EocnPG6YSiPu5noCS/kl4caLJzu8mcNEbHo9fQg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-FDFqh+DYEYnPZjLzODbygevvyrQH15WVg/pcDbiFlE0dsoL7LQ3ST3G6Vz5GfpAZyO0A8O7ekGOH81+wskmeiw=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-e4ZDOtOGLbKnCy90C+6+pAtkX/CJlAI3dPV3zF8Dtk4kCG6m+4TnbohG8z+CBaY4Tyh7HRXfCwA0sMhkZIhJ/A=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-npZ0pXzs+1mOb/G8asxE4QYUrrQlvuVjO24sgaqgQ/o8Ir3m1jTxXhETRj7IXKiPiVMIaLPV+c3XtpdDKouH9A=="; + }) + (fetchNupkg { + pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86"; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-7mbJh2PmKeWmniK6eOPGC1RZ5MGgLzf4czbisbCrCvw/wS/TXlq3kfkmT8sU+jjQQvutRbNXCES8HYK4vuVaog=="; }) ]; }; in rec { - release_10_0 = "10.0.0-preview.6"; + release_10_0 = "10.0.0-preview.7"; aspnetcore_10_0 = buildAspNetCore { - version = "10.0.0-preview.6.25358.103"; + version = "10.0.0-preview.7.25380.108"; srcs = { linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz"; - hash = "sha512-/mrP2TIr27NliznmIGDFdjriPeeSpDDbRyaM++1gNgJk55NQArHO3KgTMog2d5XlnTgkp03lH5lk3FQKgU2RiQ=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz"; + hash = "sha512-lXwjay3tSsk2fperQsxjo28PeydYBQA552QN/aOCTlpl6/LTB2L8diIqgdGUpJ593riZcUo3vCjbZwjY1bGC7Q=="; }; linux-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz"; - hash = "sha512-iGZ9ZtkKq6MGSfhNENBX2nwNtHnNs2t2gk3I4PAqRKa/XSaddNqg1reDdvLcZrYCOFWCZ1VeLO1Ay9BqrHRdag=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz"; + hash = "sha512-gTWO1Grf/RpOLglePSPWfR0ommxMUKsg4ecRYbKCPIxE3VpsJBrJs/zUoq9Rjb/7zNt7Os0HpCr5/yTF/WLGow=="; }; linux-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz"; - hash = "sha512-FczqQ09eM7SvhyvaANMNP+5ElBE6Hl17HoziBqsKLgk4T6WiI6/d5LlOo7fhK3lsGkUTi+gzKIvWh0GuhD+2yA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz"; + hash = "sha512-9onzhvf6Vrm1O9fVEKvs8rnCI1j7KTZ4RsI/u6ewphpH2G287vlrc6corwduVcNGg4SXQC4M2AuGldncHqPCuQ=="; }; linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz"; - hash = "sha512-HArq8wBlBcK/tkjyViWT9iu3pVsAULbMgecK6cwaNcrbv9VGEXBaGwv4SYqqNV0DeEfJ6nqa2j9YVWiLpqYTSQ=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz"; + hash = "sha512-uJ0bnKWphyzzZ3dKLKUVKkLtht7MGMWTsQSINGPOXPrKamn5F0SaArTSXqQVj4IqNqwNZVxTjBhOR611EYbs2w=="; }; linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz"; - hash = "sha512-CH7Qk+rFkx3YjOnIF1Q/rEp/sAcF/+cet1U6/QoVtQfrWmO46FDhT+SI3t17OaCshkmaFU5oSBWpnBIjr1NJ0A=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz"; + hash = "sha512-cAY0HJWlGRCm7gLVgemkHXZGSn777QrXedDmT8DXfEK70jNTf1fXb28P2zh/biVZK6UzYmcKXm7+1ho3TkIc7A=="; }; linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz"; - hash = "sha512-bU2Jk/BySlwwy7XDR9ovxoct3HUdvGykOI5/umDVFiZhk5g6mErGv+h5tEh4j3e6+1C5mWfe+6QD9E7j/ycx7Q=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz"; + hash = "sha512-wRf0SCHNbFWna7nr/HRlYG04rInIEO4iSys6D/T1q/Ld27sZVoOeZyrrpPlR3wtax/GTXSqQttTc3cEep8M7UQ=="; }; osx-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz"; - hash = "sha512-VlWHBJhm7w4JIR0SLJUOPYfzvCL/dA5NVQYY1ppidjuN12bBNcC95Px8zLqmTzMhQrSQ0P1ClOTFjimCB49yBA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz"; + hash = "sha512-D5iye4E6etLrWkCOe9sf/97fheARsEmF6QCV3ikW2qTDQhSsPPmgZvSbPn7gnVbXP56aGFjHHv+JAMxBRf0yVQ=="; }; osx-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz"; - hash = "sha512-c2tCqqrbhlRIvM/bOO2KlmCELsmPS4Trexq/E6imjPsWbx8dHZt6viROKAC0BwPUsxpQO+o2NZc5oEHjMsZSXQ=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz"; + hash = "sha512-FQLipaTYahQwhA2TGknRX/07ZEZeV9IdcURItxlpz7zmU4LvgoJg8Wlt1GxAnzwD9riuenLlFWe0RMoQuoreoA=="; }; }; }; runtime_10_0 = buildNetRuntime { - version = "10.0.0-preview.6.25358.103"; + version = "10.0.0-preview.7.25380.108"; srcs = { linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz"; - hash = "sha512-dkFn08ZTnl3/nj8Qh+pAs3urJy9+bB3gyGLXak0MNEUnmbRY6fpwMprijsbQfWtiSz9b0KooEubn7I+PavI7hw=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz"; + hash = "sha512-oyaRhovGFTGjL6O78RNBZGrFFBasUvaACTxXfTO2ODBqJqCjJ5poaoZUPg8v3MoOegfzYIF5UpRdybRt4pyXCQ=="; }; linux-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz"; - hash = "sha512-cbydt+UH85l1JsTzkzkUYA+Q8AAxxhc1nzuAtyuBiljcgEpe2zTGt8qx4WVx6FVVRZUNGgcgv/WzGsY3RP204w=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz"; + hash = "sha512-tTAequEUCb2/MZg7xpk39w3RezVe84D0yrMX6SHl1mFiZCzVfRmhT7ug78CadjNcbl8u6ZimDErHYssXJR04QA=="; }; linux-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz"; - hash = "sha512-f+rKqGVeFFIdtrqaeGByN38GOGTkGMXk9ep5kjop9HJO9u0WB0VFnuAo8ZJ5r6HA/t6atpM3IgiQnu+HM8oDZA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz"; + hash = "sha512-EnSHIJyzxKOUhHzO1aFduMW2bJOGboi0pweJ6iyQtB4pk+ANkZLUupiPM928iaXKL+TxmmEdftitjD4KRpLFAQ=="; }; linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz"; - hash = "sha512-XXF9htD5Vt8lgTAnA9TYSNyBQjHnEpOgkOr1axgUYIRUOj1GcOQxDrkPOS4YKtAHycx8wfRRTQ76nfO2XRCD8Q=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz"; + hash = "sha512-aCCXjXxzep/7Pj9IGsDDAm3FRsH0JzlqgwkCdTiwhu+QEHHiKiCJt3ivXlG8aJpEFCAs79lgkc0zAVtQ9+GtHA=="; }; linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz"; - hash = "sha512-4mP7M8JBvsvY8vemP5tfQSPBpmfFVEfwOiSc/1SRs4pt+mKEURwPxidFxp8wK0ytnICIwnAJNYLX28p6LsZdCg=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz"; + hash = "sha512-xJAlZHKLkx0jIHojHNSUZCKvqtFQjpGMISfcgjbc/yqVNXQQ4vC61bLYcZxkFMIJLQk4DDrnAVG1kgoyuzOHzw=="; }; linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz"; - hash = "sha512-zf3Ek3pbRF4rjuks2odZedJWiUjdX+fQH4QwW2Mh3KZNZ+1hqYweccbaHu2CLwddC7BBBVGuyw+PPhMThDZ2qA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz"; + hash = "sha512-wCfUh5zikKE4NaJWtYraqu2hdvCYgsej42+w4ik7Qo7/U+YhpHj+xF2SjxeL3VLn9KK03p4C0gSUxLmSXMtkBg=="; }; osx-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz"; - hash = "sha512-zXzElKrtYs2r8Sh6CMvDoPKPMRLoluA37YLYRdZThzJ+I0UlvxwESbA+8hhSM9RWL7Wfv9GdXyjaPgpnE3RTdw=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz"; + hash = "sha512-72B+c82XraPNoxoMvqVWzWBAmiYSqUEnJxub+SXhLfhM97MmsLXt3s07rON/1vpwENSHzdxcIyR0Xe2W+LymAA=="; }; osx-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz"; - hash = "sha512-lm3Eezqhx6qSOzVI2IdkiCNpKwU/CT5PJrhmu/WAmx3W7zi9LC5RpOgPBsXb5K7Q21uuVSrZgmRi+sMOpormFg=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz"; + hash = "sha512-4kBn/dR8b/jTCNNnNwK6FD/a3VC0pRca8qq36AYz7uGeZqC2lAvqSq6Yik05EVWjW6eOV3YM3d2lr169M1s9EA=="; }; }; }; sdk_10_0_1xx = buildNetSdk { - version = "10.0.100-preview.6.25358.103"; + version = "10.0.100-preview.7.25380.108"; srcs = { linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm.tar.gz"; - hash = "sha512-lYjjTcixBEvdjpzqH9DWtWf+3w3br0iXsVOrmz6TrElXRXgQ+p7NfaTVo22KBbxItnCv0PUtTVbRQPdCoEOCCg=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm.tar.gz"; + hash = "sha512-knm/wwbPU/3AJnPGjrwGgYsm+wXukE/zFej/UoqNWLU0KoZkIjOkpnIi9Qe2ARC4IYSSx7l5cb7nj7EKFfiu6A=="; }; linux-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm64.tar.gz"; - hash = "sha512-cwFkPqL72yWCUmxtRpnTy2V/bJDjzn8nRq1RwyCoSDwoDToV/C4HJgWyvf52NpBjo4T/Ydef+WRBg+SyHBundA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm64.tar.gz"; + hash = "sha512-qBiJz0LOz2FqdoXKsXUIaUzug+dqlhnGTomvr/TTgmaOpMft/etEU6DBPfzurIZuo9D+BfPfEkY4pMpYtP2nJQ=="; }; linux-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-x64.tar.gz"; - hash = "sha512-ZivWGncnWokxhq7VsKbmamE9M2V/cQJqJ/dl8RlreOPzoq2ljhs34Prqw5qDd7Pps7zqK3LFsG3V2YSK2Yc/Pw=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-x64.tar.gz"; + hash = "sha512-KNA8LaQR6BYb+jcUjzX/Yi6qI0GtzXKae1I/dKoh6Pf2UBnaENKG1nhY0Z/2AII4C4dDbfm8zicUe0/bIShvsg=="; }; linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm.tar.gz"; - hash = "sha512-9E/Akg2mqGl07lLa7ODP/oyJEZPOmp1ob9k+gXiB7CSLkT5xdF7ldqZb9P3BZQZxivkERM7g9wFPuJZ6k6bMyA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm.tar.gz"; + hash = "sha512-D65/QdZ5g5I0GWMqoc+JW9K+0oaBLcysWLUkrgxrgBuxhVUJ1t9L+EfkxAx5ll31z2BrwH8iV49JzAo+/1dEjQ=="; }; linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm64.tar.gz"; - hash = "sha512-xK/vp5j5cN3jplkjwCZItn87VU5Rp94TstKSRoQ3EtCGRcj8IjpAi9N+Df17+HWA0EaM+nQAlexbNbknQG+Lnw=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm64.tar.gz"; + hash = "sha512-zIjcxU2QbdIS9MOD3gfTSUfMS2RZJAtfwTqei25dfUgrymc1cXixQZUFfviDx+YOT/2ArvSEyYqXOYf+SZPBow=="; }; linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-x64.tar.gz"; - hash = "sha512-LCj610mZoxlInz08MT41eSP+UaQCG+01OZeA8trqlZzehNkYNdHjEMk71LfLaV+xT29lAa0LFmF0L/xYAVNiaQ=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-x64.tar.gz"; + hash = "sha512-hcpucoRlWBlxrzWL7dJkDADJ11xJysH6mz3plrQKE+lfNbdXPe+u/r38Z0xHjotXn4GhAwvj8WC2cgsx/f1ooQ=="; }; osx-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-arm64.tar.gz"; - hash = "sha512-xDIGEqUUEXVSocsTu6RBc72L25UGwTtLmmeumrCziq1+zU5d0dTDIwukn7luzRSyrzQWkp52UcXJkMv3ber7mg=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-arm64.tar.gz"; + hash = "sha512-eI/e7V31AEm8/hNwBZzfp0M5CkLZv1LHRVY+qsRL9UqVSqyjVjZLq2tbEIsbbZ4NbPJ8JT0uYrBkQARmn4GXxw=="; }; osx-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-x64.tar.gz"; - hash = "sha512-rWlkOrW5A00BlxcOx+TusNgSzeXwKKHq8X+w8gnOKyUZMrJBKNsMVfBXs+mv9n14vLBFmAiT+B2WlQMjYRpnlQ=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-x64.tar.gz"; + hash = "sha512-/Dk0clsJJHMl7hDlaBlhZyKmMPSBS7k8Q7YLLtvTLuI83esARdZACAi4QNBQ7Q3Etbz5WpDeG5MpNrYjVuHqVQ=="; }; }; inherit commonPackages hostPackages targetPackages; From 96d39939f362e0b91d14e1944a58a188032cec95 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 01:43:31 +0000 Subject: [PATCH 12/61] matrix-synapse-plugins.matrix-synapse-mjolnir-antispam: 1.10.0 -> 1.11.0 --- .../ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix index 8309c9971b72..8d9f5f89dfe4 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/mjolnir-antispam.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "matrix-synapse-mjolnir-antispam"; - version = "1.10.0"; + version = "1.11.0"; format = "setuptools"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; tag = "v${version}"; - sha256 = "sha256-xc/vrBL1rqgB69NqkEmUg7YMX4EZRFrRNPrWA7euaXU="; + sha256 = "sha256-+MdPJz9QEiohWZZXvGdfR6NeLS5jyHUifD6LSZbFfvs="; }; sourceRoot = "${src.name}/synapse_antispam"; From 8eb79fad9893097fa6f6a58f1b13c067eed49867 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Aug 2025 11:15:14 +0000 Subject: [PATCH 13/61] intel-compute-runtime: 25.27.34303.6 -> 25.31.34666.3 --- pkgs/by-name/in/intel-compute-runtime/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index 3abc8d94ec31..d2522b3fc585 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "25.27.34303.6"; + version = "25.31.34666.3"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; tag = version; - hash = "sha256-AgdPhEAg9N15lNfcX/zQLxBUDTzEEvph+y0FYbB6iCs="; + hash = "sha256-eijW4VYKUbiC7izaocadIxFvdZ3neaM3dewPnQDCLYc="; }; nativeBuildInputs = [ From afafa9100cb04d8cf68fe3bbf7f7e968d33b0a6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 00:34:38 +0000 Subject: [PATCH 14/61] fuzzel: 1.12.0 -> 1.13.0 --- pkgs/by-name/fu/fuzzel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fu/fuzzel/package.nix b/pkgs/by-name/fu/fuzzel/package.nix index 8e3e76bdf7d0..01f90399875a 100644 --- a/pkgs/by-name/fu/fuzzel/package.nix +++ b/pkgs/by-name/fu/fuzzel/package.nix @@ -27,14 +27,14 @@ assert (svgSupport && svgBackend == "nanosvg") -> enableCairo; stdenv.mkDerivation (finalAttrs: { pname = "fuzzel"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = finalAttrs.version; - hash = "sha256-42a8VF4EUTbyEKcfVSIbTXmPC55+cLq7FX+lRDZKXEM="; + hash = "sha256-sZycvHoKn9i+360XxDOEhieLEeicSiAqWVUJFb/VK4Y="; }; depsBuildBuild = [ From 91fe78651bb3a957dc40432259bef15bc0628f69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 07:28:39 +0000 Subject: [PATCH 15/61] pipeline: 2.6.1 -> 3.0.1 --- pkgs/by-name/pi/pipeline/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pipeline/package.nix b/pkgs/by-name/pi/pipeline/package.nix index 8323ad9145de..81589daea35a 100644 --- a/pkgs/by-name/pi/pipeline/package.nix +++ b/pkgs/by-name/pi/pipeline/package.nix @@ -30,18 +30,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "pipeline"; - version = "2.6.1"; + version = "3.0.1"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "pipeline"; rev = finalAttrs.version; - hash = "sha256-0g8J65dQoxOmdDdZHn7O1FB8fL2EdfuhbFO1VG0UCtE="; + hash = "sha256-AF34En1MKlwyOd4zKQjGAeb/c6ElJipreBTCJhbbJuI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-c9bjAc6ozCJ1l+SeR9LoQmk/wKQEXAZy0+c1+vGoE9U="; + hash = "sha256-oO0c6DMmEmeP7Q2LoTDTNeEHUgRT0c3cJnZBVo2cX1U="; }; nativeBuildInputs = [ From 982eae85c0654fa4611e9ddfb51b2ea47910e516 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 15:33:15 +0000 Subject: [PATCH 16/61] nwjs-ffmpeg-prebuilt: 0.102.0 -> 0.102.1 --- pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix index 27bd71cbc925..5e4006dda7c2 100644 --- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix +++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix @@ -7,7 +7,7 @@ let bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32"; - version = "0.102.0"; + version = "0.102.1"; in stdenv.mkDerivation { pname = "nwjs-ffmpeg-prebuilt"; @@ -16,8 +16,8 @@ stdenv.mkDerivation { src = let hashes = { - "x64" = "sha256-o9Xso1bRRfGJhf0cfWS1sS6FNugl1bbI27Jzn1YXqNw="; - "ia32" = "sha256-o9Xso1bRRfGJhf0cfWS1sS6FNugl1bbI27Jzn1YXqNw="; + "x64" = "sha256-n+HvcOg3QieUu/2Ezc+rk80XceionHjIE+xAH/MkoAc="; + "ia32" = "sha256-n+HvcOg3QieUu/2Ezc+rk80XceionHjIE+xAH/MkoAc="; }; in fetchurl { From 33b0ee6a8ebefe7b33fa2da4077e1964427fd164 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 19:08:37 +0000 Subject: [PATCH 17/61] pure-maps: 3.4.0 -> 3.4.1 --- pkgs/applications/misc/pure-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix index f93c1e6cd853..8cfae9d12993 100644 --- a/pkgs/applications/misc/pure-maps/default.nix +++ b/pkgs/applications/misc/pure-maps/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "pure-maps"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "rinigus"; repo = "pure-maps"; rev = version; - hash = "sha256-3XghdDwzt0r8Qi8W3ZMwar2aaqTNGiGsM27BHVr5C2E="; + hash = "sha256-Xh4TRc4B/rm2+S8ej/instfkO3271f0HPuqVJYGtCSM="; fetchSubmodules = true; }; From 60954f4b06e92d97707160bbc44e79276c2ac555 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Aug 2025 22:19:01 +0000 Subject: [PATCH 18/61] dool: 1.3.4 -> 1.3.6 --- pkgs/by-name/do/dool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dool/package.nix b/pkgs/by-name/do/dool/package.nix index 1be266859149..7cf0b423133c 100644 --- a/pkgs/by-name/do/dool/package.nix +++ b/pkgs/by-name/do/dool/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "dool"; - version = "1.3.4"; + version = "1.3.6"; src = fetchFromGitHub { owner = "scottchiefbaker"; repo = "dool"; rev = "v${version}"; - hash = "sha256-eyWt8gWPGiU8YavX8KT018upSB6xg8eAyRZ84snrvoY="; + hash = "sha256-4q57MIQBnXm1zfOXQyIec/T9HWDtX7nZWYMJa4YkSS8="; }; buildInputs = [ From 954b774bb5eba412f1e930f9501721b866fab58b Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 12 Aug 2025 22:26:42 +0000 Subject: [PATCH 19/61] dotnetCorePackages.dotnet_10.vmr: 10.0.0-preview.6 -> 10.0.0-preview.7 --- .../compilers/dotnet/10/bootstrap-sdk.nix | 376 +++++++++--------- .../development/compilers/dotnet/10/deps.json | 48 +-- .../compilers/dotnet/10/release-info.json | 6 +- .../compilers/dotnet/10/release.json | 14 +- ...-size-estimation-when-bundling-symli.patch | 47 +++ ...x-missing-libunwind-symbols-on-linux.patch | 42 ++ ...ernals-overwrite-rather-than-append-.patch | 26 -- pkgs/development/compilers/dotnet/vmr.nix | 27 +- 8 files changed, 328 insertions(+), 258 deletions(-) create mode 100644 pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch create mode 100644 pkgs/development/compilers/dotnet/mscordac-fix-missing-libunwind-symbols-on-linux.patch delete mode 100644 pkgs/development/compilers/dotnet/source-build-externals-overwrite-rather-than-append-.patch diff --git a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix index f9f308809983..2c89bde437d9 100644 --- a/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix @@ -11,28 +11,28 @@ let commonPackages = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Ref"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-DF9lEJjcAAcQtFB9hLXHbQaLW82nb4xlG9MKfbqpZzIQfidqcAuE2GOug/q6NNDcw+N88J0p0jKPz+k3qKmAKw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-ZedqhbGvDx8Ajn1N9SRKq4q/m7rIQdPmcvQS7WOaijpqqjNa4P4zTd1kx+/kb6a5FJ6thD6yt/hEADTGpUpflg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-SV9nyI2/sg7Rh3f01eDScmjKYuuzI6xPX+iknl2zsecspqYBlWcPN1SvMDlaD/sK3GG5jl3hrM/GcOIqMpoFJA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-OcQqR5UG3AFa0aQNIRTB3acRpQ+OhuF8ZpLIQM3xp+egvzzKRP20jja/gWhngIVtEA012XxLiNxJrHhzWhtLhQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Ref"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-npMO7GioGKn0FigriTOCsi4HgSENnW9YRJYXhyFtCGLR7b71FDLVY8nHemM0XYm9lI0tH23N1EwcDFyzHTDuNA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-1UT2fr9kFvdpRb3+h3dTmGTnhKTvGKpYFRQuZUD8ukmaQ9ABhnXp35E8GJoA6d6pOERiRnhimzrVg/X3B4znUA=="; }) (fetchNupkg { pname = "Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-zDr+tWvnlB9iEwnAlfa3PW/S1/0nw1lhvXBWghgE6o9O5sxc35V3aobPAs+Cm6DTN+lvNMouhjPt6pn2t4PvQQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-Eekoq6ATo+jeIsK0GafnGK8XkdjKtdOVT7deD1TWo04/nt0KV7nOmBUOhwUKY1sBsjvTQvOoDthn505f74N3Vg=="; }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-W1yNC4+7vV1XPSXJx7HFsvFCi1C1XZ7QVlfbu+xq4pt1/0cVJGZaRlbwBNUAv4PAdg2JGM4VYtcr3ZreOJ1hzA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-pX4P7NG1jHIRJrbHrVP/MvDyA89o7HeuKucToiIH6flQ5ixTntZJupIW5qg2wsScJOltfP3A7j/w6MTRA9dHOQ=="; }) ]; @@ -40,118 +40,118 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-IKe0SROzAWJiFZyh2KVmTU5i8ddcEqvr5NIr+3RfzvBEYa3SNBbqy1W1x0TR2aEvYgSqxKSohhs9YVSDlrlx0Q=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-ekrR6F7cC48jWc0+Fyv3emOc5bkuv+yvKg2ZDjuv9gRf6e8zWGG6PkXKkPuo8sxHacPucgc1bIibVgVGJi20VA=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-5h33Uf2vFcjVkeNRD41YiERegQ7twv6sljYAMtz/kIHcIk90aB0ztZoKXXVi+vNxma7q/f5oPxhzUVidZ3vw8g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-QUg7nZopW/0+Lnk4VeNHF3Ov3I6IuqsDSbvkeEDWjWyNXyOnJzDErKN3d5p6jWdmc3jjndyOw1137vaOKV5apA=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-yImkb4fnUJIXR2Me5N8eOrX7w9+u8SAAIp8QtlWdZ6WptjG6PUByTs2hjTfX/aVKjO4p1dmKTaWJ0qYR6yuDEQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-k9W3fq0DjcbjxuveOQd1ou8fsHhNH/zHayPE9b1VRj2CijLx8krGGKkP3gUR7jLbOE+o9/Xln7cEsWzRBb9tdg=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-1FIBZLtWKIxULrRjLrldz6kwVSoAIf72kXKE0WgXECVez98NbQXLEM90hfpHj0LcQfzqOoP9kY48yRSoXp+rXg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-+zsgGnlZS6MdL/uyvAQAN0KAc8Vk1qT8ylHCi+iwUXqwslSGtZQku+qGvkd7hjMMnEbnSa5j7xJY4PNGDbco4Q=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-eMokXhxbTVJUHwlAhM1dVZmjljs/s1nRfvrJ0AeJaTbetXnD63Fd6sQeMmw/EifYnpdtxr/gIJRHLPsuLNDcAA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-+LG/u+Jp6b3Oyud1QYP3nph1uqtx4rhPbeH65leIMSFQg6bB8Jd9g4hNwESllHd6iKpKP7Sp17VxLKynzxwHDw=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-qw5Xb2+l14q+2OSesjwGn3gHpdFj0wUeA3RLEUaljzW8FF5HD78B6t1YuhFJhcENuDNAv5d8Fcy4N1mG/RQZUw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-BE7hZwP4oZ5Xacmhjwc3Ciy0KJKOXwg9NJiBVzFv7xEJ7IqVceP7kAdMPsMNoojwz2KNs9gJdCOGOLtwyeTZyw=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-Etq6qbPIzEV8Z3+w0C1ibreDduKkAF1zZOGfvcBz3sjAC9sWs/qflxfKGZ7tBKhEV/A3vZWKNGyxYKnawCtC3g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-oskWoBpDhGI4WBOJPFTBIirjUdSs7hvHKGuz8OQmrByyv8C3rY9jtt+sM45uqINoGNyYsgbUQkQlKFhIB+mT+Q=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-SINZNHzxrKbgD7VGAx9GDMIlMOmXSpqWIeLpmNpPTm2D7F+NfXv2lVLxLl0nLUAJ70ipI51HdHGyrKXTOaFO8g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-+/apDtwjBvmEn40DJ4yPOYqCsgIfhrD/zPYY15A6ny5kN1n6uV8LgUce9vv2HatRsD4uOuepD2z22/TbB8GjLA=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-t2YTlMAHq+V8K8TnsFhUudCqiV5CElb/dk2tFmZ61Td4gyLY/iz+4q5lvpGAZOlCFddTtublSbIC3n4EH3liEQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-+uZHCjs+FlbFU2StjeANC3vvYjWd+6PlhIX0F8sHS60u3U9/HEi4JECQ0vhak5ODJCi+wktEKZQ53DwGAvPbJQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-lEaH55DO++s5EKEHfODZkF279HI5DROQgaTif93wcMg9mhL5kPHnLhi9S7qTMFKt+GQfmZWMlwZd+L6GVz+RVQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-mtm6VWoDGYg7qlqF6sFlf8LBEbGOL6ZCSoqzZ7hmDBy9UIe0AswL0d+AhsDOE5ewHifbK+vGqXeK83ZdL/1IRA=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-zuh5p3Hq0ejcgbCe3IaVOj+mItbRve25QdIXaGirOfDuO2a5fGXSO8RtgFosw8ar2jBSG3qL6loMFqqgkiEuVA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-/X/ugPn9DMhWz26lDvuSlBqX/s56B7Sl/Qkd2/Jy5iYw64+9tOFo0Xh4kz0fF5nOj1H9RbKxIaNfPVc41rxvIQ=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-Ivl/uKKvVrgGxfbC8SSz5N1NZRi39PQ5ZXfsECiSsiNR2ls02Wy2Icy5mLRUGCFY4FMILAKsgfJRKejafqGxyA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-/SiUD5N7pwkJ4mK83CBkre6oOB76BTJ7lJUTDDw3t8F6HUJS+3i6Cx9sODd7BS7TXXA5ahql2gcfohVsaFsR9Q=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-zTiRlyK4ElT/MES3AX1bLRcuX3lY3NXlwL89YTyEjuHrqjCpxEbHfsoznqYd7zLAF1itzvNnxDkqDPoXat/zZA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-WKqXIohGOzMUpDOsAEpknxj93fSuTzSdP7X/Ud19dggmqwPKMIWN5NZpWlBLdyP8+NMwLyNM/aR4uCtNf7MT2A=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-sSi6F1x2UVJe5Jp8RbURsNGVxFFPyxq6P8ZlV6r9dimYM2KkDyEOtcZ0hHSOtmMU3rghzZYksvSKv7+9fAYUNA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-GQokK1ugeF0JQi0IfkyNDm5nIVCKpH6V8zSskBRSAH8O5U4iVImpDkqBg1icxUFIAaVyiMi6GJB0CkTD2cC+yQ=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-Qj4yn5t5k+lGY8dBPwh0jLQOXoilcVvwpmyxJp8LJHoOM8EmGjRoiCy68sRXGTQMt5d3iNIdV93rX+fXu20rlw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-X15A3yBhigC8T81Ut1Zqqay9HzfCjjwLh1QDbHL2XggIWiGzkDf4hSX7qnkbki12DdFZP5p0xDFiYsnEBTGNgg=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-b26YbRN+y0LrdVq32iV7gUmi8sY4vY+P8GvaqiPTcJBH20OSfrsvDhyM08qMs6hCDo17xL5hFdLt9BSBfqcrOw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-vNMheP+ysMxIiINElw4ebu7O8KHDz+l2dYTlP9zfBllo7eJW3XX0k7kOP0nYke78KFhheXu2JUHAAEZVhazOUA=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-IoNNvrZ/pKBwn/XSvDp1saM2XHk1ZOKxrA4lDyrL10/s4IS8hRo/Yv3qs+ihWpwVStORW3lh0YIxQhMDHbMkzw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-478qsicUIxQcpq/UGGoNNLRbUldl34RRZqxDdRl1HqC2D4aUdCpR3MEU5vd0zcbHxkegfPfgQgsv6xfIt+k/Ww=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-/D+xqMtDuo8ji4FPJm5EsEORBGEsbcHHYIjZDiEHP7ltIexg/oOSwuyvepvV+mK46Q4uyQU9zuBVZaG5FdKU0Q=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-fDGfrQnqXasfMLIUs2xVvLNxWjN0w7HypZ22wYG0y8PkN8u3vpVIQz9tYgUgEXvxKpFLYq1L2EcxksY6reAWug=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-kEXLQCzNVAnwkQ58qiO7lUOuO6WJSMlNmnQxx5o1RTiMIoqrgfjMazn5bpL5DPeZjMhWcB4kary/3Vkj06xRtA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-WE52ljXg7k8/ry1wBJ7lqrKniEZgwpMtuf7m82tMtuc30k5X+1nAbOa2evezPgjsXrB3k78uertzT+GoSRX/fQ=="; }) ]; }; @@ -160,361 +160,361 @@ let linux-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-z0RiU5O+4aelPS7+JYakKFXrmczOzTYp5sptrRoz8H2zM0Tbvwc7sX3pT2F5ZosBEaub37XJKrwSdvpdHoe6/w=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-TY4LXwPBf9d0vOpzCkV8Ze9e/Tnn4V07FkSctLB6Vc6XreNkVqEQcB1TuUQZOFc7pXBvpImRAD5mAfuLVNohDA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-CRQl1RVkbfaLnYOEO4ApZ6Py1OG8zJjwU0UkAcIhg7MqsGgZcathISOzlDYayxqdbp+Gga21aaJJZbL0TSPkdw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-UBWg0zDyYiiy3wXtxmRqaoAvi2hpXGGJ4VxoKcqgD927ftcYXz80g5dFDtk8zof3CVnfXHgaDCm40jxOrYU3qw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-UjSZtTgg1EEmNJeI+Esg2pMNjSb+lCy0VjwkUIVUJA6vezRNsb66NjsO5h4rvSMS2VhoKWGc7jbNV1AKRj891g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-ZHAexbNsU0DMvR9vVqYldw9m+wyqLM5AVZyx6E6Lgk5JzjgDI9rFfDI2h+UGi1WOJyKPDKrjyLWG5phtGC6ytg=="; }) (fetchNupkg { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-h8mVEj/5JRPzKcDpoHvnQ0wt7nn7+euuPKLDtWH4yiAWztH8CX6udfHqjIE103USfpfMKEEcEWRqOe877rgp2Q=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-HmKdrzhgbW4ikm6lKWgaBm5OokH7aPyGuaniMHvRKnHSeUxDYMj2PU/ZSIlIxTntxELeTBd+ZcJlknJqR7Duuw=="; }) ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-rXmRirmXSlmvrc4lY76+eK6UoXIi78sUSDggleEYs6Mwip1PWWQ1bg2Bi3tpxcRgF1MBOgHhiz37lybWaS1y7A=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-bPfmwsqmA39Vfa+Uu9mH1eaCJZo/qd+/O0aOYRhjSrypYBQK2AIif8lq7zYxhOR2U5AhvkkeqLNnaEC3spTHiA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-sw5cXyvNbbXyDkmnPJqNgSnOeDFdl9VL7OfA4kA2GcPCujXhnElVmF48rwibVtoYmDUe940zKPjUAeuXmmOH+g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-OSpFCcAHBwfDK4bY6zNDfbtY+fKY6koEgvfVyk6OtdUI+dOM/Jjw9Kyxiqe1S8JC5dm3366+AFdqF2ZWbMW4fw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-BYeSSlt4ck/kK7L9I+OYdI+aklnF9JDNaHyIQ+nea+E/e6qqENxlgDPzJKwTKAX4XdIF7Rc/Gk14PuYBpC7+Ew=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-gFoRuWxJUSjqz8meGfPQhK/xI8LXK0/z2mOiVWfwFBO1lMuPUWFrzlUvoPBHhZSYj7578iHtUog8r/tnnK6+Bw=="; }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-poxX0QwFAsVfHDfH85V0BVd5dEtlhr+/3rPhCe5qhkFscmUM31BcD1ABbzdxYt/PRJKnKMCCA/tOHhMU5rUieA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-BLvup3LOAkOw5G/xJ0j9pcTNNQuPLibW0u5bTVAmMYYZny8b39xNWWVqNQ8Rl5jewPko/8luoany0SbHZ+GUpQ=="; }) ]; linux-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-kPsplrPdJ9VmThmB0kXTumkVG0WikMbkSRzGVyNU/Ploa9Cvv80PnCxF5VBAqRV1l/l3qBq9TZQV+7c6mIef9Q=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-2NeuUX5T7ZRuc76byZXf7cLXYTK5fGufEbrjEXRlBMXyI+vQ8x+6BR+hbqef9JGylT8pcLv+xL11Gx39vk2KmQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-LOoGtTUAg4/m9912v1s4yvh/wx64gRW6+052ZpHphizEbI/mvy5MGZpxS/WQHX34+RDXIG90CpdT7caL5iC1JA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-iZO21GJ4K+PjcH9Gn/OUVQrBkkfCVCifO+PsQItVuWuenEOwAShzCfz8E5icd/INLIosoriCyRV777jpjxHZXg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-t10QcEDpbrSvoe2BhUCtqOAqfXayzy9uujpiIeAdOyptGmBppA37G+F4cCRsIx6wzhCSrdPkYoh1KzD4rqqlyA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-SAKw8xQa/VBWOumG7JmId0UIKUs2RM8tnl3KPXJ85mjnrrP3wJLWynNf6v/hMxdxqjAOIb2Y6AIGwK4zFzA97g=="; }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-ykHn7VUDn711h67XQd+nx5Tn0L0vYWQY8kKWqqTXm/mBEM5CjoMd9qft6jirusGORVxC5RAnUENDt5n48B4xfg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-PTVNAmlIQRHnMCcw8Pm5+t8eLLtwyZ1J6lUjTcZ68dU9FGXIySRr750lekvMpBugMjmXIsNw0VQvg9AnL5SIDQ=="; }) ]; linux-musl-arm = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-6G+05BJAEjErJMixdkEAndBjgaCe7WmasdRypKPtYRfzvPVExrq/nak0ZiaJ0Dd3WuYdbi69Qyeuhj7atnAImw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-VbIqcklAsQYAAV5CTXo/6NAa6lkirCeh1XF7Yo2D6xZmkwLbQsKfNF1jpiwYr6luiVwJCkIA6p/owsPAZT42gA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-xjepU2UUYCP30YJHPdX0PN6C0ZqP2RKAEsJWpnNSlYQ8fcDHgy+l5ZTQPBD4egfWKlPCEtgSZod3p9nTggSoDA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-H5a0wdzBU4tWXtTkYcgHsezWolqD59sDLSlDdOGE/OF7p3X1AijCo1BKCb/ub+Qn24dXoS7RGQf4TwmPP/fDdw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-NORvYn5NilmBCZzLwrWXEPI7WeEKKwIHzh5USjQHQLsSoiWcOSZVKQLkqK2baSFjGktLyHmHRUQ6VnTggDuPeg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-DpKE33FA9NYJXAY5SbKcIfAvU5RyH30YqhCXxHi/NYfEcR6e5hrzn4992S6TpUQzeYHeJHprfXEQGK+x8bWTqg=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-tMM7GajJVqT1W1qOzxmrvYyFTsTiSNrXSl0ww5CYz/pKr05gvncBdK0kCD9lYHruYMPVdlYyBCAICFg1kvO7aA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-prERCrIwyGg735ahEDi15HwriaDnwZlQidlFkiDSOuh4EJTXLqbYvwJxSygCNIgKAivNEwt5HuqAR0WxIzxLJA=="; }) ]; linux-musl-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-wUU31YeB3hCc41XTTSXbhuYKKSbFv3rQb4aO0d93B1m8xPZfUpYA121ysuwaaiPgHvFK27wfYBHAAO82d1Tbsg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-gI8nk0A8LtN/NXufax5tgmoxnAFvG9SUA+yGfBz82HlAvwZkWeQsNjZav06LsIdBgY+34oJqPfhGFWki234b3A=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-eQ28Igd0kDwNnBeaXvQul2U4Za4KTkBJ2hF5gi6/8xL8tJAIvpSiuHrcspBB7oqr9/uOU6R4eR7gDmOH0OVRaQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-6deTINJifUd+6BioAPScqa94hbH35wweO3UazZ0Dob4GFoSxD/z7jUjRIib/HmyhXz+F/QMOZapPNN+qNsmEPg=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-zHJSkQl00ygE1BBWjjSZgQmT+rpX/ZoNvU3az2Vfk0D9tqM4+zQ0M0IdBw0Eu1Wr46LeifWIScp4pTvzBB0R/w=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-T93T3DT3SakSQcwaB9SFTT6R38hEh0/52bM+4IqvFAo1EAKx3eXiKezE3bMSjOGKHxKzb71Rp1d9Jflv6capLQ=="; }) (fetchNupkg { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-RaDmfdtde+m27g31HXvBUJme7NUUT07bv5+Wp3mPH/FXE6tT8W1DvG9XNRcT2rIEDq24ktpfyBiNbN8fieBfqw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-dnHqxZvkLe4SubfrXiPhb08qkj2FOrdCBWLHo/Hd+pSop3C86rCTRJY454LrPwjnktjnQf/X0b4anadwOkckrg=="; }) ]; linux-musl-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-723qKUmFeBKN0yfsf9zhP3k5ZKqK4UYvdKbDL80oyhzm4gQZ6tsUU4fHeHjJVJfqyN+wKS+R0WthyxhA9m07/g=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-8r/yMsXff3vlFUaRzlHKnkd/qxmbo6FzATU4d065j8YTNZcduF/uKiOKijwXSd96nj216RjCUIJWrcH72c5H6Q=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-hPcjYztP9miyYl+mqvTqoEqaa+fp+kCFVrROIwUEDBMNs6Urk76qsWJWE/uI9kLBh1zTHiDsWlXDiOXcftVBxA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-D6qubx3bzbfdDMJw1CcUJdPR2w2oHmOt/ur4q4Pi8cdFueROux3u2bcuurKmx2eZvHhYVKnL1njTxWDVHUM1OA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-IG7yOIrrLUvA22aUGR7g9VtXK3WGCsID9TokGqET+LoO4QTLlFRYjbrsUkvttuGUHftOTgDh+4abzkcqaTfd6A=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-neXYzUGCn4zBhHa4+9NgG6c0ulwsfGczrrH2hqJcwf16fNtBgfe9L+JnwRctrVVe7iOci/qYh69c36OlCsREug=="; }) (fetchNupkg { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-3PwE2oDr4+n93nPZbHz1kgJkpdus91UR5IXKnMWMMxcEq+VgNvNpU4+M+khwPOXSmxK9LY6dsd9beQVIFtrDVg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-D8SDjyznO8H+3w5eAuL1pl+JZ+4S8eXM8gIMuNaDXvBZv43lU2by27Gk+Ue4eH5zV+462fBtBvqZtaETgfPsgQ=="; }) ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-QVYtaGiLQ0bWTiav/cc2Ps+PQ9co8EmTW8NAzlf835camz7gdjZHKo5/z4FOVUHVftCY9vn2yBuBcwceI6f+Bg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-vk6trHjpJkCveABOceuodbxeAefojPqaUCGwU6HXinNgu281I/iEF7Afj6mJBLHxaPcvlFQjAjbRhll1SwcSNw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-4ktCvzYslGK2G2CLPy4As8rbHGPtQw0RA5VC9WxRmRpDH/3cyicFbRaBRVc2y19p0tV9nMC9KdaFyptm80lQZg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-r1LB1Ilq1/Pf71SubpoHU53s5bjfHY/TLQUhG2R3AGFMe1S2J6H35pkXuCdwBH+x99AX4khX1zw00BCYP5liVQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-MPUbFdcUXGrfUpdNmcPvq+EdaBLcl+4+nsbUwftOT1041DpIUkFfDzgWNWVMjPG3Prf3K0iKPtvdKx9bdUlq6A=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-ovDMqhvYv4o6P/AjvAh26EcSs6auYHe4YBgWF7SBLgB/r1xOvjlRZRuVL7znu/js0CwTH7h8w/YvW+q1+Tzw/A=="; }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-CtxI7P/Il0bLfPXN6ofeL4Vm4ISp3TjvRBZt8MkACaTErFseNiwIIAKNqZ+d9lIxj1MDGA5fCfVn/0PsGIksRg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-K7jCpNm0lYr/dHheLoaPadsd9q8oQ0X+iK/rJkeKrZ76FLzAvcC1FqX9yXICwAW44m63bXcmg0ggra1+yXx0/Q=="; }) ]; osx-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-p18BC5bG9/0ktSBUvxZOqPpr9qkS0Z6G71GViCAzjtV+fBllt6OE7T0rSvOZ14FjZFcSqMA2HZ60I3H93cK6TA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-R7g8lya69aqDY/iAIIoX8TnbxEJxBIxvuqD0zrcEuJgRh33b2xys9OAT2NmyZH3GWdTZ5UPiolJ2SifKNE1ztQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-T9Rhlb0Ivsaev2JNEKRLRoc5pyowBy+meS7GzijwfHOEviRw2rMpPNK+8DoygI8HRetSnjLghMlzdcfURF10LA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-tPbKNB5TVRIAHyts6RMV2AP7pnmO/1MRtfTByCqTkTjH945dJ8+2r4ytMIoQ3ooVLi00yll9w2tDL+XnuNT3xw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-7SI6G+CVFjxrcgJny64fmvOp4Pz02EXrhlKJdEKoht+enh8c/1pY55cgR5jq9GWJ9iJNtV9/sDUiADK74NWWKQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-W18K405wGThiTnn12Mi0K6KXznjPZX87mX9APiq+nbKIsMmGC+r7cyIPgy9hmggnTb3qqv1p/0PACRD6NXm0CQ=="; }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-ui1NVLgK7tEN1Xv+MO8FRovfg1OR4sKGf5GXHz2CN88GLkzznp5m9sSAETN2IPueRV+aaQ8JFaLEEw1QOdlh2Q=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-K7fKG8YuufAgq6VcvotJH/D4uHmcjg/X9TwWq8EmbyysqyNCuMkg6a1torpyaomdooKSZ0LSOodqbo57B6jERg=="; }) ]; win-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-kTwrqjATCL5woNksB+G2B39lOIUkxLnouFruipzLnsDKSxG50pKIhxWUkrwTfwatL/zQasE+aVlwEfSQAxQteQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-alvGXGuLfWb35dOybu83zGbH9VyIJRf17FEhF6yrNGvg8gJ3SwpU/N2uGnuxI1TIb8dFlKq3FoE2hqfxWAERKA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-86sGYDN7tFGBhAUacYgosah0TTIMT1czQtKHb6vKXOGo1wWAYa+MsGXrdUA6o3rpvybL8rbRANQ1tarIfui4Bw=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-8345qvf7b3Q8hoqXErpJTWQeLmBV3GFUNa/hp8eCglnY5WWbnfd/muQAdA5zUoOX/8fMA4TILhZx2K0M8k1/mw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-VkXVbi8EbajQYu5pge5VCXxWGhHJtLivHM+rqHt78b8w2IpYfRACV7lqEU1COg9D3sZEG5oLOzKLCCN7lSiekA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-um95x3i3Jdyat4T6HTXP9I0STmsqJyuTWmZwCg/5EPNWMX1fm/OIFIoUQ9lX2kplPyq6Ys0hmiBaVcHOHGThgw=="; }) (fetchNupkg { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-CUdm0Uw4kGSk6oVm8QZLSwxngMFmbNoiFXve2hT0/Csu4mJe6ttV8C/Y0VLPBJr3GmoovOzMeH3coQfEf2YvBA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-LneCr0cNCIEYVfDI2Ab++j+baaKut+pqTsCb3R9FAp9pqYVXveSEXn8V4xx+N0i//SQx4i9Dkd+oYGERun9k2A=="; }) ]; win-x64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-kV1DnmxJrCauIvUfNe4wC4Yi888dzxxf7sYT4W/apnCSHvcjueYEZOGtoLSirsJJrn5aj9OeFVz+bAbd9nurxg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-xr4GBhH7aIMfPXjv+CuGZI3h1PZc+yETwn3/9UMOXXNxgM1zrkCR1p4I8rQNpwVPd440P8pReq2AWrdbLX7kTQ=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-XsP6i0SHVuDjS0IWBC+/3QXDJO+3ARuFbPSu9fRjR5NkK5/A4lQpBWJRymTzqWHzmD0DLYMEfwR+3mdG2A/StQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-slvRNr3ZPyyGLrOFEPVF91TD6BJcC7/UKrowVg0XGq37IxTeicrNLhs7PE8qmVGBgUTiKcqxEU7DXI2/qBh9nA=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-UsW6m9/wuBUWM8SU/PHsn+9GQMRp4i00KfWDzE/s6rnCs40WRvy5Zcj923XMy05Bt04dhSrOOmDR1/vkydaysg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-1JBZRsQMZ4mCN0rS+F6wwP7s7+es+uwx6hG9ubUuccJYjCEAWwDg3vBVAbQqwMOF9rdbqOLFbkbvawOT7BHAaw=="; }) (fetchNupkg { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-Btz15yrqllW8cQ82bDOMB+fo1ONv4j+BvpZGQTt4zwqgyxq3qznnxVHrMxiG+UUwhDlD4ajCGYuZCjHECODTHg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-8fiTrOmlVMojv2oFxSO4zKP0Mz+3HazxfqBFBbgioN+/dMNiCa6ql3Sm0kp88Qmfcb68PwhWCJLy3x3XHLEUuA=="; }) ]; win-x86 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-bVGv/VP4T598HMR97vrcF8NxOv43rTn4RtH5JSm/Z/I2l6Jf4OsEmrP7ciCJho65xgG2NN7E80dAfv6Waan/DQ=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-t0G1lpmSy3Bb/0k4riHo+oT2h53IbHHC92oy3Mnxg2Nm/ZBoGDW55/maB5lF+IbEoNsScpAhsFNf7gAv5KPOhw=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-OvOg+DllupzQyo2AiWJOWhd3G7sXoROVbGIbaO48l3cXJf+EkT3mwK0WyKNJo1SYDBSHP4PL3CELLyl7KeuBTA=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-Xgu9wAHojyPC6/9OhNk4Bpmhmb4FAcJMMb3S7xwwPFuEx7pKSCPOA/3Gv/8xR3w3lYoMhvs94Jn4zzLPw/d46A=="; }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-di/eQOCbK7Gckc/GaFEJbeHA8xc1sjPYb4ZgSDQG8s/lSc5EocnPG6YSiPu5noCS/kl4caLJzu8mcNEbHo9fQg=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-FDFqh+DYEYnPZjLzODbygevvyrQH15WVg/pcDbiFlE0dsoL7LQ3ST3G6Vz5GfpAZyO0A8O7ekGOH81+wskmeiw=="; }) (fetchNupkg { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.0-preview.6.25358.103"; - hash = "sha512-e4ZDOtOGLbKnCy90C+6+pAtkX/CJlAI3dPV3zF8Dtk4kCG6m+4TnbohG8z+CBaY4Tyh7HRXfCwA0sMhkZIhJ/A=="; + version = "10.0.0-preview.7.25380.108"; + hash = "sha512-npZ0pXzs+1mOb/G8asxE4QYUrrQlvuVjO24sgaqgQ/o8Ir3m1jTxXhETRj7IXKiPiVMIaLPV+c3XtpdDKouH9A=="; }) ]; }; in rec { - release_10_0 = "10.0.0-preview.6"; + release_10_0 = "10.0.0-preview.7"; aspnetcore_10_0 = buildAspNetCore { - version = "10.0.0-preview.6.25358.103"; + version = "10.0.0-preview.7.25380.108"; srcs = { linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz"; - hash = "sha512-/mrP2TIr27NliznmIGDFdjriPeeSpDDbRyaM++1gNgJk55NQArHO3KgTMog2d5XlnTgkp03lH5lk3FQKgU2RiQ=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz"; + hash = "sha512-lXwjay3tSsk2fperQsxjo28PeydYBQA552QN/aOCTlpl6/LTB2L8diIqgdGUpJ593riZcUo3vCjbZwjY1bGC7Q=="; }; linux-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz"; - hash = "sha512-iGZ9ZtkKq6MGSfhNENBX2nwNtHnNs2t2gk3I4PAqRKa/XSaddNqg1reDdvLcZrYCOFWCZ1VeLO1Ay9BqrHRdag=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz"; + hash = "sha512-gTWO1Grf/RpOLglePSPWfR0ommxMUKsg4ecRYbKCPIxE3VpsJBrJs/zUoq9Rjb/7zNt7Os0HpCr5/yTF/WLGow=="; }; linux-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz"; - hash = "sha512-FczqQ09eM7SvhyvaANMNP+5ElBE6Hl17HoziBqsKLgk4T6WiI6/d5LlOo7fhK3lsGkUTi+gzKIvWh0GuhD+2yA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz"; + hash = "sha512-9onzhvf6Vrm1O9fVEKvs8rnCI1j7KTZ4RsI/u6ewphpH2G287vlrc6corwduVcNGg4SXQC4M2AuGldncHqPCuQ=="; }; linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz"; - hash = "sha512-HArq8wBlBcK/tkjyViWT9iu3pVsAULbMgecK6cwaNcrbv9VGEXBaGwv4SYqqNV0DeEfJ6nqa2j9YVWiLpqYTSQ=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz"; + hash = "sha512-uJ0bnKWphyzzZ3dKLKUVKkLtht7MGMWTsQSINGPOXPrKamn5F0SaArTSXqQVj4IqNqwNZVxTjBhOR611EYbs2w=="; }; linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz"; - hash = "sha512-CH7Qk+rFkx3YjOnIF1Q/rEp/sAcF/+cet1U6/QoVtQfrWmO46FDhT+SI3t17OaCshkmaFU5oSBWpnBIjr1NJ0A=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz"; + hash = "sha512-cAY0HJWlGRCm7gLVgemkHXZGSn777QrXedDmT8DXfEK70jNTf1fXb28P2zh/biVZK6UzYmcKXm7+1ho3TkIc7A=="; }; linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz"; - hash = "sha512-bU2Jk/BySlwwy7XDR9ovxoct3HUdvGykOI5/umDVFiZhk5g6mErGv+h5tEh4j3e6+1C5mWfe+6QD9E7j/ycx7Q=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz"; + hash = "sha512-wRf0SCHNbFWna7nr/HRlYG04rInIEO4iSys6D/T1q/Ld27sZVoOeZyrrpPlR3wtax/GTXSqQttTc3cEep8M7UQ=="; }; osx-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz"; - hash = "sha512-VlWHBJhm7w4JIR0SLJUOPYfzvCL/dA5NVQYY1ppidjuN12bBNcC95Px8zLqmTzMhQrSQ0P1ClOTFjimCB49yBA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz"; + hash = "sha512-D5iye4E6etLrWkCOe9sf/97fheARsEmF6QCV3ikW2qTDQhSsPPmgZvSbPn7gnVbXP56aGFjHHv+JAMxBRf0yVQ=="; }; osx-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.6.25358.103/aspnetcore-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz"; - hash = "sha512-c2tCqqrbhlRIvM/bOO2KlmCELsmPS4Trexq/E6imjPsWbx8dHZt6viROKAC0BwPUsxpQO+o2NZc5oEHjMsZSXQ=="; + url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-preview.7.25380.108/aspnetcore-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz"; + hash = "sha512-FQLipaTYahQwhA2TGknRX/07ZEZeV9IdcURItxlpz7zmU4LvgoJg8Wlt1GxAnzwD9riuenLlFWe0RMoQuoreoA=="; }; }; }; runtime_10_0 = buildNetRuntime { - version = "10.0.0-preview.6.25358.103"; + version = "10.0.0-preview.7.25380.108"; srcs = { linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm.tar.gz"; - hash = "sha512-dkFn08ZTnl3/nj8Qh+pAs3urJy9+bB3gyGLXak0MNEUnmbRY6fpwMprijsbQfWtiSz9b0KooEubn7I+PavI7hw=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm.tar.gz"; + hash = "sha512-oyaRhovGFTGjL6O78RNBZGrFFBasUvaACTxXfTO2ODBqJqCjJ5poaoZUPg8v3MoOegfzYIF5UpRdybRt4pyXCQ=="; }; linux-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-arm64.tar.gz"; - hash = "sha512-cbydt+UH85l1JsTzkzkUYA+Q8AAxxhc1nzuAtyuBiljcgEpe2zTGt8qx4WVx6FVVRZUNGgcgv/WzGsY3RP204w=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-arm64.tar.gz"; + hash = "sha512-tTAequEUCb2/MZg7xpk39w3RezVe84D0yrMX6SHl1mFiZCzVfRmhT7ug78CadjNcbl8u6ZimDErHYssXJR04QA=="; }; linux-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-x64.tar.gz"; - hash = "sha512-f+rKqGVeFFIdtrqaeGByN38GOGTkGMXk9ep5kjop9HJO9u0WB0VFnuAo8ZJ5r6HA/t6atpM3IgiQnu+HM8oDZA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-x64.tar.gz"; + hash = "sha512-EnSHIJyzxKOUhHzO1aFduMW2bJOGboi0pweJ6iyQtB4pk+ANkZLUupiPM928iaXKL+TxmmEdftitjD4KRpLFAQ=="; }; linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm.tar.gz"; - hash = "sha512-XXF9htD5Vt8lgTAnA9TYSNyBQjHnEpOgkOr1axgUYIRUOj1GcOQxDrkPOS4YKtAHycx8wfRRTQ76nfO2XRCD8Q=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm.tar.gz"; + hash = "sha512-aCCXjXxzep/7Pj9IGsDDAm3FRsH0JzlqgwkCdTiwhu+QEHHiKiCJt3ivXlG8aJpEFCAs79lgkc0zAVtQ9+GtHA=="; }; linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-arm64.tar.gz"; - hash = "sha512-4mP7M8JBvsvY8vemP5tfQSPBpmfFVEfwOiSc/1SRs4pt+mKEURwPxidFxp8wK0ytnICIwnAJNYLX28p6LsZdCg=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-arm64.tar.gz"; + hash = "sha512-xJAlZHKLkx0jIHojHNSUZCKvqtFQjpGMISfcgjbc/yqVNXQQ4vC61bLYcZxkFMIJLQk4DDrnAVG1kgoyuzOHzw=="; }; linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-linux-musl-x64.tar.gz"; - hash = "sha512-zf3Ek3pbRF4rjuks2odZedJWiUjdX+fQH4QwW2Mh3KZNZ+1hqYweccbaHu2CLwddC7BBBVGuyw+PPhMThDZ2qA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-linux-musl-x64.tar.gz"; + hash = "sha512-wCfUh5zikKE4NaJWtYraqu2hdvCYgsej42+w4ik7Qo7/U+YhpHj+xF2SjxeL3VLn9KK03p4C0gSUxLmSXMtkBg=="; }; osx-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-arm64.tar.gz"; - hash = "sha512-zXzElKrtYs2r8Sh6CMvDoPKPMRLoluA37YLYRdZThzJ+I0UlvxwESbA+8hhSM9RWL7Wfv9GdXyjaPgpnE3RTdw=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-arm64.tar.gz"; + hash = "sha512-72B+c82XraPNoxoMvqVWzWBAmiYSqUEnJxub+SXhLfhM97MmsLXt3s07rON/1vpwENSHzdxcIyR0Xe2W+LymAA=="; }; osx-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.6.25358.103/dotnet-runtime-10.0.0-preview.6.25358.103-osx-x64.tar.gz"; - hash = "sha512-lm3Eezqhx6qSOzVI2IdkiCNpKwU/CT5PJrhmu/WAmx3W7zi9LC5RpOgPBsXb5K7Q21uuVSrZgmRi+sMOpormFg=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-preview.7.25380.108/dotnet-runtime-10.0.0-preview.7.25380.108-osx-x64.tar.gz"; + hash = "sha512-4kBn/dR8b/jTCNNnNwK6FD/a3VC0pRca8qq36AYz7uGeZqC2lAvqSq6Yik05EVWjW6eOV3YM3d2lr169M1s9EA=="; }; }; }; sdk_10_0_1xx = buildNetSdk { - version = "10.0.100-preview.6.25358.103"; + version = "10.0.100-preview.7.25380.108"; srcs = { linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm.tar.gz"; - hash = "sha512-lYjjTcixBEvdjpzqH9DWtWf+3w3br0iXsVOrmz6TrElXRXgQ+p7NfaTVo22KBbxItnCv0PUtTVbRQPdCoEOCCg=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm.tar.gz"; + hash = "sha512-knm/wwbPU/3AJnPGjrwGgYsm+wXukE/zFej/UoqNWLU0KoZkIjOkpnIi9Qe2ARC4IYSSx7l5cb7nj7EKFfiu6A=="; }; linux-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-arm64.tar.gz"; - hash = "sha512-cwFkPqL72yWCUmxtRpnTy2V/bJDjzn8nRq1RwyCoSDwoDToV/C4HJgWyvf52NpBjo4T/Ydef+WRBg+SyHBundA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-arm64.tar.gz"; + hash = "sha512-qBiJz0LOz2FqdoXKsXUIaUzug+dqlhnGTomvr/TTgmaOpMft/etEU6DBPfzurIZuo9D+BfPfEkY4pMpYtP2nJQ=="; }; linux-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-x64.tar.gz"; - hash = "sha512-ZivWGncnWokxhq7VsKbmamE9M2V/cQJqJ/dl8RlreOPzoq2ljhs34Prqw5qDd7Pps7zqK3LFsG3V2YSK2Yc/Pw=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-x64.tar.gz"; + hash = "sha512-KNA8LaQR6BYb+jcUjzX/Yi6qI0GtzXKae1I/dKoh6Pf2UBnaENKG1nhY0Z/2AII4C4dDbfm8zicUe0/bIShvsg=="; }; linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm.tar.gz"; - hash = "sha512-9E/Akg2mqGl07lLa7ODP/oyJEZPOmp1ob9k+gXiB7CSLkT5xdF7ldqZb9P3BZQZxivkERM7g9wFPuJZ6k6bMyA=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm.tar.gz"; + hash = "sha512-D65/QdZ5g5I0GWMqoc+JW9K+0oaBLcysWLUkrgxrgBuxhVUJ1t9L+EfkxAx5ll31z2BrwH8iV49JzAo+/1dEjQ=="; }; linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-arm64.tar.gz"; - hash = "sha512-xK/vp5j5cN3jplkjwCZItn87VU5Rp94TstKSRoQ3EtCGRcj8IjpAi9N+Df17+HWA0EaM+nQAlexbNbknQG+Lnw=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-arm64.tar.gz"; + hash = "sha512-zIjcxU2QbdIS9MOD3gfTSUfMS2RZJAtfwTqei25dfUgrymc1cXixQZUFfviDx+YOT/2ArvSEyYqXOYf+SZPBow=="; }; linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-linux-musl-x64.tar.gz"; - hash = "sha512-LCj610mZoxlInz08MT41eSP+UaQCG+01OZeA8trqlZzehNkYNdHjEMk71LfLaV+xT29lAa0LFmF0L/xYAVNiaQ=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-linux-musl-x64.tar.gz"; + hash = "sha512-hcpucoRlWBlxrzWL7dJkDADJ11xJysH6mz3plrQKE+lfNbdXPe+u/r38Z0xHjotXn4GhAwvj8WC2cgsx/f1ooQ=="; }; osx-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-arm64.tar.gz"; - hash = "sha512-xDIGEqUUEXVSocsTu6RBc72L25UGwTtLmmeumrCziq1+zU5d0dTDIwukn7luzRSyrzQWkp52UcXJkMv3ber7mg=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-arm64.tar.gz"; + hash = "sha512-eI/e7V31AEm8/hNwBZzfp0M5CkLZv1LHRVY+qsRL9UqVSqyjVjZLq2tbEIsbbZ4NbPJ8JT0uYrBkQARmn4GXxw=="; }; osx-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.6.25358.103/dotnet-sdk-10.0.100-preview.6.25358.103-osx-x64.tar.gz"; - hash = "sha512-rWlkOrW5A00BlxcOx+TusNgSzeXwKKHq8X+w8gnOKyUZMrJBKNsMVfBXs+mv9n14vLBFmAiT+B2WlQMjYRpnlQ=="; + url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-preview.7.25380.108/dotnet-sdk-10.0.100-preview.7.25380.108-osx-x64.tar.gz"; + hash = "sha512-/Dk0clsJJHMl7hDlaBlhZyKmMPSBS7k8Q7YLLtvTLuI83esARdZACAi4QNBQ7Q3Etbz5WpDeG5MpNrYjVuHqVQ=="; }; }; inherit commonPackages hostPackages targetPackages; diff --git a/pkgs/development/compilers/dotnet/10/deps.json b/pkgs/development/compilers/dotnet/10/deps.json index 6a0248680962..7e94efd6ed1b 100644 --- a/pkgs/development/compilers/dotnet/10/deps.json +++ b/pkgs/development/compilers/dotnet/10/deps.json @@ -1,50 +1,50 @@ [ { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", - "sha256": "ac90a9d11e9397e6e3dff022f99459d0666e2d29e899ac06471e860ae5173980", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg", - "version": "10.0.0-preview.6.25302.104" + "sha256": "aa14afd80807b2b9f4956b8600d20f7d3516aecf05f55d1ca7d905a329cfe83b", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg", + "version": "10.0.0-preview.7.25322.101" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "c5a904d430cbe6014fea6ace35a339838f598ac2560ab741ecc085a00f37ae49", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg", - "version": "10.0.0-preview.6.25302.104" + "sha256": "53c920333f4762f1f79b108726129c1d8c1416ccd76526fe3a9a7ab7a1f93597", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg", + "version": "10.0.0-preview.7.25322.101" }, { - "hash": "sha256-Nupnw/U9dxLxWNqETTtxyvJhuuGDPyU+ksmZ+qwSkxk=", + "hash": "sha256-KhdfkhtQFehIcwo3koGdmmqSTXZD3jbZUMxj61cX0LA=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg", - "version": "10.0.0-preview.6.25302.104" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg", + "version": "10.0.0-preview.7.25322.101" }, { - "hash": "sha256-QHSni2ad7MQEQoCMRPWTtwmMOTZaDWn/CZbUanLAc2Y=", + "hash": "sha256-/R26o0IJCYf6Fa/uxTNpRh4E9Sm5JrUlC6yr7V/sMiw=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg", - "version": "10.0.0-preview.6.25302.104" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg", + "version": "10.0.0-preview.7.25322.101" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", - "sha256": "06130621565ec2be89c86e322af5abc095c4efe0334f8dfc3ea43695c1ed9893", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg", - "version": "10.0.0-preview.6.25302.104" + "sha256": "7a685b61f9aa514104e2d43698696a035b701879262bfd9795ef282a506a572e", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg", + "version": "10.0.0-preview.7.25322.101" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "43da2ec6d8351784865e8a18113f2c90211c13966d352765316b5d5c9f4b3cbd", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg", - "version": "10.0.0-preview.6.25302.104" + "sha256": "ff8889ae28490cfe2906cf1fb9ea1a299dbe7300e5645d36e1b144ec79ae7374", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg", + "version": "10.0.0-preview.7.25322.101" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", - "sha256": "0234d829a2e019b4b3f87b93c068c14cc3d71be6d489a3c8e4c358f9a1609d36", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg", - "version": "10.0.0-preview.6.25302.104" + "sha256": "3a512f5afee951500f328f2c166eb11d877cc0ce8a176358ecc5bbabe8a14f7a", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg", + "version": "10.0.0-preview.7.25322.101" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", - "sha256": "ce1b95a1611a442ead51a5a6f33939311a94c20dee287d1aa903b0e1425a5e28", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg", - "version": "10.0.0-preview.6.25302.104" + "sha256": "7c0cf48f6a48ab0b7b4cd339aed9c1626873674e614fea33e15ee7c938514e8d", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg", + "version": "10.0.0-preview.7.25322.101" } ] diff --git a/pkgs/development/compilers/dotnet/10/release-info.json b/pkgs/development/compilers/dotnet/10/release-info.json index 49f114107afb..535b6de70133 100644 --- a/pkgs/development/compilers/dotnet/10/release-info.json +++ b/pkgs/development/compilers/dotnet/10/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-ffQAL6kerSjdOcd4YsC1374zH2gBDsdWJeBTwEsTUbo=", - "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.6.25302.104.centos.9-x64.tar.gz", - "artifactsHash": "sha256-CEmna8eEx6+8nxThVGnqWkz6DSJOnJWuFrCWzDRoAYo=" + "tarballHash": "sha256-sE7HIeZfg3Q4/izN7ZNg+KHCQAkp7NwJXoe2BA+E4Ww=", + "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.7.25322.101-1.centos.10-x64.tar.gz", + "artifactsHash": "sha256-jwyPybGkBPrmwDBkesqEauTEFNTgBv/sUW3jaUnWbt4=" } diff --git a/pkgs/development/compilers/dotnet/10/release.json b/pkgs/development/compilers/dotnet/10/release.json index 7e368bbb2a0d..98a497ec5bc7 100644 --- a/pkgs/development/compilers/dotnet/10/release.json +++ b/pkgs/development/compilers/dotnet/10/release.json @@ -1,11 +1,11 @@ { - "release": "10.0.0-preview.6", + "release": "10.0.0-preview.7", "channel": "10.0", - "tag": "v10.0.0-preview.6.25358.103", - "sdkVersion": "10.0.100-preview.6.25358.103", - "runtimeVersion": "10.0.0-preview.6.25358.103", - "aspNetCoreVersion": "10.0.0-preview.6.25358.103", + "tag": "v10.0.100-preview.7.25380.108", + "sdkVersion": "10.0.100-preview.7.25380.108", + "runtimeVersion": "10.0.0-preview.7.25380.108", + "aspNetCoreVersion": "10.0.0-preview.7.25380.108", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "75972a5ba730bdaf7cf3a34f528ab0f5c7f05183", - "officialBuildId": "20250708.3" + "sourceVersion": "30000d883e06c122311a66894579bc12329a09d4", + "officialBuildId": "20250730.8" } diff --git a/pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch b/pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch new file mode 100644 index 000000000000..deb7f49211cb --- /dev/null +++ b/pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch @@ -0,0 +1,47 @@ +From 8fa3570bf75c48bf68f42b74790bf8ba0f032a3f Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Thu, 14 Aug 2025 10:49:40 -0300 +Subject: [PATCH] bundler: fix file size estimation when bundling symlinks + +--- + .../managed/Microsoft.NET.HostModel/Bundle/Bundler.cs | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs b/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs +index a5e8b593484..39f39334251 100644 +--- a/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs ++++ b/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs +@@ -284,6 +284,12 @@ public string GenerateBundle(IReadOnlyList fileSpecs) + throw new ArgumentException("Invalid input specification: Must specify the host binary"); + } + ++ static long GetFileLength(string path) ++ { ++ var info = new FileInfo(path); ++ return ((FileInfo?)info.ResolveLinkTarget(true) ?? info).Length; ++ } ++ + (FileSpec Spec, FileType Type)[] relativePathToSpec = GetFilteredFileSpecs(fileSpecs); + long bundledFilesSize = 0; + // Conservatively estimate the size of bundled files. +@@ -293,7 +299,7 @@ public string GenerateBundle(IReadOnlyList fileSpecs) + // We will memory map a larger file than needed, but we'll take that trade-off. + foreach (var (spec, type) in relativePathToSpec) + { +- bundledFilesSize += new FileInfo(spec.SourcePath).Length; ++ bundledFilesSize += GetFileLength(spec.SourcePath); + if (type == FileType.Assembly) + { + // Alignment could be as much as AssemblyAlignment - 1 bytes. +@@ -314,7 +320,7 @@ public string GenerateBundle(IReadOnlyList fileSpecs) + { + Directory.CreateDirectory(destinationDirectory); + } +- var hostLength = new FileInfo(hostSource).Length; ++ var hostLength = GetFileLength(hostSource); + var bundleManifestLength = Manifest.GetManifestLength(BundleManifest.BundleMajorVersion, relativePathToSpec.Select(x => x.Spec.BundleRelativePath)); + long bundleTotalSize = hostLength + bundledFilesSize + bundleManifestLength; + if (_target.IsOSX && _macosCodesign) +-- +2.50.1 + diff --git a/pkgs/development/compilers/dotnet/mscordac-fix-missing-libunwind-symbols-on-linux.patch b/pkgs/development/compilers/dotnet/mscordac-fix-missing-libunwind-symbols-on-linux.patch new file mode 100644 index 000000000000..a6e95daf1841 --- /dev/null +++ b/pkgs/development/compilers/dotnet/mscordac-fix-missing-libunwind-symbols-on-linux.patch @@ -0,0 +1,42 @@ +From 9ec09da8755f2888a2ae15c52e223953785bc146 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Wed, 13 Aug 2025 16:03:41 -0300 +Subject: [PATCH] mscordac: fix missing libunwind symbols on linux + +--- + src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt b/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt +index 71b69336e2e..dc3b79d6933 100644 +--- a/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt ++++ b/src/runtime/src/coreclr/dlls/mscordac/CMakeLists.txt +@@ -157,6 +157,12 @@ set(COREDAC_LIBRARIES + ${END_LIBRARY_GROUP} # End group of libraries that have circular references + ) + ++if(CLR_CMAKE_HOST_UNIX) ++ list(APPEND COREDAC_LIBRARIES ++ coreclrpal_dac ++ ) ++endif(CLR_CMAKE_HOST_UNIX) ++ + if(CLR_CMAKE_HOST_WIN32) + # mscordac.def should be generated before mscordaccore.dll is built + add_dependencies(mscordaccore mscordaccore_def) +@@ -205,12 +211,6 @@ if(CLR_CMAKE_HOST_WIN32 AND CLR_CMAKE_TARGET_UNIX) + ) + endif(CLR_CMAKE_HOST_WIN32 AND CLR_CMAKE_TARGET_UNIX) + +-if(CLR_CMAKE_HOST_UNIX) +- list(APPEND COREDAC_LIBRARIES +- coreclrpal_dac +- ) +-endif(CLR_CMAKE_HOST_UNIX) +- + target_link_libraries(mscordaccore PRIVATE ${COREDAC_LIBRARIES}) + + esrp_sign(mscordaccore) +-- +2.50.0 + diff --git a/pkgs/development/compilers/dotnet/source-build-externals-overwrite-rather-than-append-.patch b/pkgs/development/compilers/dotnet/source-build-externals-overwrite-rather-than-append-.patch deleted file mode 100644 index a52fb2d9244a..000000000000 --- a/pkgs/development/compilers/dotnet/source-build-externals-overwrite-rather-than-append-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 393d224e7b05c73baf9f5d5130d7c9d15c5fc526 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Fri, 13 Jun 2025 15:32:52 -0300 -Subject: [PATCH] source-build-externals: overwrite rather than append - NuGet.config - ---- - .../src/repos/projects/Directory.Build.targets | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/source-build-externals/src/repos/projects/Directory.Build.targets b/src/source-build-externals/src/repos/projects/Directory.Build.targets -index 5b374f4fc42..9ed8cff895c 100644 ---- a/src/source-build-externals/src/repos/projects/Directory.Build.targets -+++ b/src/source-build-externals/src/repos/projects/Directory.Build.targets -@@ -101,7 +101,7 @@ - ]]> - - -- -+ - - CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. @@ -141,9 +145,8 @@ stdenv.mkDerivation rec { ./vmr-compiler-opt-v8.patch ] ++ lib.optionals (lib.versionAtLeast version "10") [ - # src/repos/projects/Directory.Build.targets(106,5): error MSB4018: The "AddSourceToNuGetConfig" task failed unexpectedly. - # src/repos/projects/Directory.Build.targets(106,5): error MSB4018: System.Xml.XmlException->Microsoft.Build.Framework.BuildException.GenericBuildTransferredException: There are multiple root elements. Line 9, position 2. - ./source-build-externals-overwrite-rather-than-append-.patch + ./mscordac-fix-missing-libunwind-symbols-on-linux.patch + ./bundler-fix-file-size-estimation-when-bundling-symli.patch ]; postPatch = '' @@ -178,11 +181,15 @@ stdenv.mkDerivation rec { -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \ src/source-build-reference-packages/src/referencePackages/Directory.Build.props + '' + + lib.optionalString (lib.versionOlder version "10") '' # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848 xmlstarlet ed \ --inplace \ -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \ - src/source-build-externals/src/${lib.optionalString (lib.versionAtLeast version "10") "repos/src/"}application-insights/.props/_GlobalStaticVersion.props + src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props + '' + + '' # this fixes compile errors with clang 15 (e.g. darwin) substituteInPlace \ From 3ca5ae95601379faeead7a25888d1de520d2fcdb Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 20 Aug 2025 15:01:31 -0300 Subject: [PATCH 20/61] roslyn-ls: pin net8/9 versions --- pkgs/by-name/ro/roslyn-ls/deps.json | 168 ------------------ pkgs/by-name/ro/roslyn-ls/package.nix | 26 ++- .../ro/roslyn-ls/runtimedownload.patch | 15 -- 3 files changed, 24 insertions(+), 185 deletions(-) delete mode 100644 pkgs/by-name/ro/roslyn-ls/runtimedownload.patch diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index c8b31d32d7d5..3a74e40f419e 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -29,66 +29,6 @@ "hash": "sha256-WnXjX2pGroKn+KukCgPeUUZAkz2S6CdMrCc9P2VcBDQ=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.198/messagepack.annotations.2.5.198.nupkg" }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "8.0.17", - "hash": "sha256-NNGXfUV5RVt1VqLI99NlHoBkt2Vv/Hg3TAHzm8nGM8M=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/8.0.17/microsoft.aspnetcore.app.ref.8.0.17.nupkg" - }, - { - "pname": "Microsoft.AspNetCore.App.Ref", - "version": "9.0.6", - "hash": "sha256-5lyWeyUruj1azKGhUa09h7CrKQFKG/eeKFER2X4RxO8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.ref/9.0.6/microsoft.aspnetcore.app.ref.9.0.6.nupkg" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "8.0.17", - "hash": "sha256-Eunz3nZF5r8a9nqwdeorQPgqd5G+Z4ddofMeAk6VmnA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/8.0.17/microsoft.aspnetcore.app.runtime.linux-arm64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64", - "version": "9.0.6", - "hash": "sha256-OYGCWHvZCYDdgJK2IL0pePsOOTgq6y0rQt5gDJedv2s=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-arm64/9.0.6/microsoft.aspnetcore.app.runtime.linux-arm64.9.0.6.nupkg" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "8.0.17", - "hash": "sha256-SWdah72tC5i2CQL4mRUYfHC0Kh8+C2jiskIIeC74smY=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/8.0.17/microsoft.aspnetcore.app.runtime.linux-x64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", - "version": "9.0.6", - "hash": "sha256-q0dK5La8B+fxo2Qtz9TA+KFTDW3/6+Y1XtsGF3H9TJY=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.linux-x64/9.0.6/microsoft.aspnetcore.app.runtime.linux-x64.9.0.6.nupkg" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", - "version": "8.0.17", - "hash": "sha256-y55EGfQ2FzrY2X5+Ne5N3dqi5WNHkFTGVW1hEMrh6OI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/8.0.17/microsoft.aspnetcore.app.runtime.osx-arm64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64", - "version": "9.0.6", - "hash": "sha256-xZrp6yT2GYYazdzwXJ+54/j0jbrso94/bgBGeSgEA+I=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-arm64/9.0.6/microsoft.aspnetcore.app.runtime.osx-arm64.9.0.6.nupkg" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", - "version": "8.0.17", - "hash": "sha256-uRCCNPevPemvKIuUxy/VtQlgskChbiAauMWVK/xhoc0=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/8.0.17/microsoft.aspnetcore.app.runtime.osx-x64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64", - "version": "9.0.6", - "hash": "sha256-0L5HMCXRf7qkj0yuAGlt3ZWrXVAKzEfnRzi+cX+heEQ=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.aspnetcore.app.runtime.osx-x64/9.0.6/microsoft.aspnetcore.app.runtime.osx-x64.9.0.6.nupkg" - }, { "pname": "Microsoft.Bcl.AsyncInterfaces", "version": "9.0.0", @@ -293,114 +233,6 @@ "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw=", "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.6.3/microsoft.net.stringtools.17.6.3.nupkg" }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "8.0.17", - "hash": "sha256-pzOqFCd+UrIXmWGDfds5GxkI+Asjx30yFtLIuHFu/h4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/8.0.17/microsoft.netcore.app.host.linux-arm64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-arm64", - "version": "9.0.6", - "hash": "sha256-c03NdUDlM2oM0MBOTLsYhRfS64teVXfue3SNSza2gJI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/9.0.6/microsoft.netcore.app.host.linux-arm64.9.0.6.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "8.0.17", - "hash": "sha256-AGnEGHcO2hfvChG3xEGOTA6dX4MiYPB7FoBkmWz3dc8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/8.0.17/microsoft.netcore.app.host.linux-x64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Host.linux-x64", - "version": "9.0.6", - "hash": "sha256-OQwudVyZi+SeLpiNzxpkxVjNZSs0kq4GG10zF3TERS8=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/9.0.6/microsoft.netcore.app.host.linux-x64.9.0.6.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-arm64", - "version": "8.0.17", - "hash": "sha256-fpMzkOWaA3OFNtHsqOk9s9xKVrcrqOyKHxE7jk8hebg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/8.0.17/microsoft.netcore.app.host.osx-arm64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-arm64", - "version": "9.0.6", - "hash": "sha256-mkLxg2k2NH64SPJ87pgKdYMYXQa7nGbSVf/yfNX3s+g=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-arm64/9.0.6/microsoft.netcore.app.host.osx-arm64.9.0.6.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-x64", - "version": "8.0.17", - "hash": "sha256-Hrn01x+S+gnGEEHhr6mN6bPyqVAhp5u3CqgWwQbh4To=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/8.0.17/microsoft.netcore.app.host.osx-x64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Host.osx-x64", - "version": "9.0.6", - "hash": "sha256-NRrb7WQPpZqarH7OTsBZWroNrBCS6sMdiGm2wlqqXNw=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.osx-x64/9.0.6/microsoft.netcore.app.host.osx-x64.9.0.6.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "8.0.17", - "hash": "sha256-tKawpjkMjV0ysNIWWrgHTiLxncZJDRNiDkQBwl255l4=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/8.0.17/microsoft.netcore.app.ref.8.0.17.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Ref", - "version": "9.0.6", - "hash": "sha256-pSDW5VBIA11bwuZv8klq4+P+X6jFwZqu9JR1M1aUT9k=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.ref/9.0.6/microsoft.netcore.app.ref.9.0.6.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "8.0.17", - "hash": "sha256-FutphE4bEjd8s6ZqpFXrD1zuCDkNCJ7Vnl0pBm86HBA=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/8.0.17/microsoft.netcore.app.runtime.linux-arm64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-arm64", - "version": "9.0.6", - "hash": "sha256-+SEo4lrzGnLk1+jJQeJeYS7PJxDID/N1WH6snfsRGAI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-arm64/9.0.6/microsoft.netcore.app.runtime.linux-arm64.9.0.6.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "8.0.17", - "hash": "sha256-6YVEXiJ3b2gZAYri8iSRBdi/J+0DEl7FcwBX6h1Unkg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/8.0.17/microsoft.netcore.app.runtime.linux-x64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.linux-x64", - "version": "9.0.6", - "hash": "sha256-Y3VzFepVQghnvo6LWoeGnBAaWygy/eLJ8oLlnmRHjps=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.linux-x64/9.0.6/microsoft.netcore.app.runtime.linux-x64.9.0.6.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", - "version": "8.0.17", - "hash": "sha256-J3dfDial8GHyKQMFuBNFtOMD/mOK58vjrK2ZtrYObZg=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/8.0.17/microsoft.netcore.app.runtime.osx-arm64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-arm64", - "version": "9.0.6", - "hash": "sha256-ZxAcTppjSDMaMaRXKX8C4BNg3d1Hy6xVt4AuPpPTxwI=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-arm64/9.0.6/microsoft.netcore.app.runtime.osx-arm64.9.0.6.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-x64", - "version": "8.0.17", - "hash": "sha256-WnkJyhSBHMw/VtLHWy0AFwzzkbIC1YQugFuj3Adg+Ks=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/8.0.17/microsoft.netcore.app.runtime.osx-x64.8.0.17.nupkg" - }, - { - "pname": "Microsoft.NETCore.App.Runtime.osx-x64", - "version": "9.0.6", - "hash": "sha256-3wCLKoYt6LeJwV14M1DkZspmjxTUdqsiRSJ96y3qMvk=", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.runtime.osx-x64/9.0.6/microsoft.netcore.app.runtime.osx-x64.9.0.6.nupkg" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "5.0.0", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 6f7c37ee7b66..bd5385c56cb9 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -7,6 +7,7 @@ testers, roslyn-ls, jq, + writeText, }: let pname = "roslyn-ls"; @@ -28,6 +29,24 @@ let rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; project = "Microsoft.CodeAnalysis.LanguageServer"; + + targets = writeText "versions.targets" '' + + + + ${dotnetCorePackages.sdk_8_0.runtime.version} + ${dotnetCorePackages.sdk_9_0.runtime.version} + ${dotnetCorePackages.sdk_8_0.runtime.version} + ${dotnetCorePackages.sdk_9_0.runtime.version} + + + ${dotnetCorePackages.sdk_8_0.runtime.version} + ${dotnetCorePackages.sdk_9_0.runtime.version} + + + + ''; + in buildDotnetModule rec { inherit pname dotnet-sdk dotnet-runtime; @@ -57,20 +76,23 @@ buildDotnetModule rec { # until made configurable/and or different location # https://github.com/dotnet/roslyn/issues/76892 ./cachedirectory.patch - # Force download of apphost - ./runtimedownload.patch ]; postPatch = '' # Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version. jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp mv global.json.tmp global.json + + substituteInPlace Directory.Build.targets \ + --replace-fail '' '' ''; dotnetFlags = [ "-p:TargetRid=${rid}" # this removes the Microsoft.WindowsDesktop.App.Ref dependency "-p:EnableWindowsTargeting=false" + # this is needed for the KnownAppHostPack changes to work + "-p:EnableAppHostPackDownload=true" ]; # two problems solved here: diff --git a/pkgs/by-name/ro/roslyn-ls/runtimedownload.patch b/pkgs/by-name/ro/roslyn-ls/runtimedownload.patch deleted file mode 100644 index a1fee909c1f0..000000000000 --- a/pkgs/by-name/ro/roslyn-ls/runtimedownload.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj -index c32f01a6695..b98bab44c4e 100644 ---- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj -+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj -@@ -54,8 +54,8 @@ - win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64 - - -- false -- false -+ true -+ true - - - true From c76be00b8e3bb8004e8ad51d03d8bdd95b390013 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 21 Aug 2025 13:59:27 -0300 Subject: [PATCH 21/61] roslyn-ls: add initialisation tests --- pkgs/by-name/ro/roslyn-ls/package.nix | 44 +++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index bd5385c56cb9..87ec6e89e5e5 100644 --- a/pkgs/by-name/ro/roslyn-ls/package.nix +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -8,6 +8,8 @@ roslyn-ls, jq, writeText, + runCommand, + expect, }: let pname = "roslyn-ls"; @@ -48,7 +50,7 @@ let ''; in -buildDotnetModule rec { +buildDotnetModule (finalAttrs: rec { inherit pname dotnet-sdk dotnet-runtime; vsVersion = "2.87.26"; @@ -121,7 +123,43 @@ buildDotnetModule rec { ''; passthru = { - tests.version = testers.testVersion { package = roslyn-ls; }; + tests = + let + with-sdk = + sdk: + runCommand "with-${if sdk ? version then sdk.version else "no"}-sdk" + { + nativeBuildInputs = [ + finalAttrs.finalPackage + sdk + expect + ]; + meta.timeout = 60; + } + '' + HOME=$TMPDIR + expect <<"EOF" + spawn ${meta.mainProgram} --stdio --logLevel Information --extensionLogDirectory log + expect_before timeout { + send_error "timeout!\n" + exit 1 + } + expect "Language server initialized" + send \x04 + expect eof + catch wait result + exit [lindex $result 3] + EOF + touch $out + ''; + in + { + # Make sure we can run with any supported SDK version, as well as without + with-net9-sdk = with-sdk dotnetCorePackages.sdk_9_0; + with-net10-sdk = with-sdk dotnetCorePackages.sdk_10_0; + no-sdk = with-sdk null; + version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; updateScript = ./update.sh; }; @@ -133,4 +171,4 @@ buildDotnetModule rec { maintainers = with lib.maintainers; [ konradmalik ]; mainProgram = "Microsoft.CodeAnalysis.LanguageServer"; }; -} +}) From 33bdbd0579ac551ffa18d763e3993bc190336ca8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 21 Aug 2025 21:06:04 +0100 Subject: [PATCH 22/61] nano: 8.5 -> 8.6 Changes: https://lists.gnu.org/archive/html/info-gnu/2025-08/msg00008.html --- pkgs/by-name/na/nano/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix index 692053ab7f5d..3d9c8e9c4bee 100644 --- a/pkgs/by-name/na/nano/package.nix +++ b/pkgs/by-name/na/nano/package.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "8.5"; + version = "8.6"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - hash = "sha256-AAsBHTOcFBr5ZG1DKI9UMl/1xujTnW5IK3h7vGZUwmo="; + hash = "sha256-96v78O7V9XOrUb13pFjzLYL5hZxV6WifgZ2W/hQ3phk="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; From e039bafe45c2e8128a3eea84d4845917b3616bcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Aug 2025 23:52:43 +0000 Subject: [PATCH 23/61] sby: 0.55 -> 0.56 --- pkgs/by-name/sb/sby/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix index 7f01f8466315..8ac2b53c0824 100644 --- a/pkgs/by-name/sb/sby/package.nix +++ b/pkgs/by-name/sb/sby/package.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "sby"; - version = "0.55"; + version = "0.56"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "sby"; tag = "v${version}"; - hash = "sha256-Q02CLx8GYu7Rnngd03kRGstYVOm8mBl7JsP0bYOFtDg="; + hash = "sha256-uKndGUoLbG7SBhsOSYyM/v9g33pq7zFFajzvTUYa7NY="; }; nativeCheckInputs = [ From 601a1d80f1921210569ef3cdf96309ddac8539ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Thu, 21 Aug 2025 23:58:29 +0000 Subject: [PATCH 24/61] pnpm_10: 10.14.0 -> 10.15.0 --- pkgs/development/tools/pnpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 189f18727da5..abe35197b783 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -16,8 +16,8 @@ let hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc="; }; "10" = { - version = "10.14.0"; - hash = "sha256-KXU05l1YQkUFOcHoAiyIMateH+LrdGZHh6gVUZVC1iA="; + version = "10.15.0"; + hash = "sha256-hMGeeI19fuJI5Ka3FS+Ou6D0/nOApfRDyhfXbAMAUtI="; }; }; From f813cdf76be6118b9879a82333aae42d455be447 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 01:00:32 +0000 Subject: [PATCH 25/61] cimg: 3.5.5 -> 3.6.0 --- pkgs/by-name/ci/cimg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index 2d3d6d963c98..699f650eb86d 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.5.5"; + version = "3.6.0"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; tag = "v.${finalAttrs.version}"; - hash = "sha256-vVRdSjrSCprhxraLzZ531zIYXsqbnnxOcoawJddwvgY="; + hash = "sha256-j4WYdLQvNZAMb+16zO4M24CNKJFTITN9VXa1jFKduOk="; }; outputs = [ From 4d4fcdbc5a3db39f3e389b7f882698a18a3d7bd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 03:48:31 +0000 Subject: [PATCH 26/61] python3Packages.coiled: 1.118.1 -> 1.118.3 --- pkgs/development/python-modules/coiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index e9141b124cdb..0b2a75ee6c1e 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "coiled"; - version = "1.118.1"; + version = "1.118.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-74LILNrkvopEdEdECe0pwfgwxdGrfXucWf76Vkj95GQ="; + hash = "sha256-HjbBZsTqb3D5uh3cBZPFkhe/QbJtnHwduUDCaMl3vc4="; }; build-system = [ From 0f9dcfb70bc99c6b22ec275dcc07e92bbc0d61d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Aug 2025 05:00:25 +0000 Subject: [PATCH 27/61] python3Packages.resolvelib: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/resolvelib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/resolvelib/default.nix b/pkgs/development/python-modules/resolvelib/default.nix index 3bb181342c65..9dc507922700 100644 --- a/pkgs/development/python-modules/resolvelib/default.nix +++ b/pkgs/development/python-modules/resolvelib/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "resolvelib"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "sarugaku"; repo = "resolvelib"; - rev = version; - hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8="; + tag = version; + hash = "sha256-8ffJ1Jlb/hzKY4pfE3B95ip2e1CxUByiR0cul/ZnxxA="; }; build-system = [ setuptools ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolve abstract dependencies into concrete ones"; homepage = "https://github.com/sarugaku/resolvelib"; - changelog = "https://github.com/sarugaku/resolvelib/blob/${src.rev}/CHANGELOG.rst"; + changelog = "https://github.com/sarugaku/resolvelib/blob/${src.tag}/CHANGELOG.rst"; license = licenses.isc; maintainers = [ ]; }; From bd8730182360577a13948e818dff60c24e10652b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Guimmara?= Date: Fri, 22 Aug 2025 15:44:13 +0200 Subject: [PATCH 28/61] docker-color-output: fix binary name --- pkgs/by-name/do/docker-color-output/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/do/docker-color-output/package.nix b/pkgs/by-name/do/docker-color-output/package.nix index 9008d9ac70f1..a5a29249beb4 100644 --- a/pkgs/by-name/do/docker-color-output/package.nix +++ b/pkgs/by-name/do/docker-color-output/package.nix @@ -16,6 +16,10 @@ buildGoModule rec { hash = "sha256-r11HNRXnmTC1CJR871sX7xW9ts9KAu1+azwIwXH09qg="; }; + postInstall = '' + mv $out/bin/cli $out/bin/docker-color-output + ''; + vendorHash = null; passthru = { From f0d61f002420e9a92c1d28127617f14027fb7b0b Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 22 Aug 2025 20:45:28 +0200 Subject: [PATCH 29/61] shader-slang: 2025.12.1 -> 2025.14.3 Changelogs: - https://github.com/shader-slang/slang/releases/tag/v2025.13 - https://github.com/shader-slang/slang/releases/tag/v2025.13.1 - https://github.com/shader-slang/slang/releases/tag/v2025.13.2 - https://github.com/shader-slang/slang/releases/tag/v2025.14 - https://github.com/shader-slang/slang/releases/tag/v2025.14.1 - https://github.com/shader-slang/slang/releases/tag/v2025.14.2 - https://github.com/shader-slang/slang/releases/tag/v2025.14.3 --- pkgs/by-name/sh/shader-slang/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix index 78edfe7f43ac..b45b51197a47 100644 --- a/pkgs/by-name/sh/shader-slang/package.nix +++ b/pkgs/by-name/sh/shader-slang/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "shader-slang"; - version = "2025.12.1"; + version = "2025.14.3"; src = fetchFromGitHub { owner = "shader-slang"; repo = "slang"; tag = "v${finalAttrs.version}"; - hash = "sha256-5M/sKoCFVGW4VcOPzL8dVhTuo+esjINPXw76fnO7OEw="; + hash = "sha256-tHLm0XmS5vV+o3VmFHWG8wZnrb0p63Nz1zVyvc/e5+s="; fetchSubmodules = true; }; @@ -114,13 +114,14 @@ stdenv.mkDerivation (finalAttrs: { # Handled by separateDebugInfo so we don't need special installation handling "-DSLANG_ENABLE_SPLIT_DEBUG_INFO=OFF" "-DSLANG_VERSION_FULL=v${finalAttrs.version}-nixpkgs" - # slang-rhi tries to download WebGPU dawn binaries, and as stated on - # https://github.com/shader-slang/slang-rhi is "under active refactoring - # and development, and is not yet ready for general use." - "-DSLANG_ENABLE_SLANG_RHI=OFF" "-DSLANG_USE_SYSTEM_MINIZ=ON" "-DSLANG_USE_SYSTEM_LZ4=ON" "-DSLANG_SLANG_LLVM_FLAVOR=${if withLLVM then "USE_SYSTEM_LLVM" else "DISABLE"}" + # slang-rhi tries to download headers and precompiled binaries for these backends + "-DSLANG_RHI_ENABLE_OPTIX=OFF" + "-DSLANG_RHI_ENABLE_VULKAN=OFF" + "-DSLANG_RHI_ENABLE_METAL=OFF" + "-DSLANG_RHI_ENABLE_WGPU=OFF" ] ++ lib.optionals withGlslang [ "-DSLANG_USE_SYSTEM_SPIRV_TOOLS=ON" From f056e4a287d51964d5bba72019e3c20fe0a93199 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 23 Aug 2025 11:46:48 +0200 Subject: [PATCH 30/61] zizmor: 1.11.0 -> 1.12.1 Change was already accepted in #433902 but reverted in 106b1418bc30cbae35addcb643a883e22de9573b. https://github.com/zizmorcore/zizmor/releases/tag/v1.12.1 https://github.com/zizmorcore/zizmor/releases/tag/v1.12.0 --- pkgs/by-name/zi/zizmor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix index cde6a3164478..0ce9a1fd6dad 100644 --- a/pkgs/by-name/zi/zizmor/package.nix +++ b/pkgs/by-name/zi/zizmor/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zizmor"; - version = "1.11.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "zizmorcore"; repo = "zizmor"; tag = "v${finalAttrs.version}"; - hash = "sha256-zxEF76zpqwLroC5GjSkwIC3+XdXmErvabIEqhVe0zCA="; + hash = "sha256-GnKSbcsVYzbhsrwIUAEArltzQe0IE2tiIr2CqsMQyzk="; }; - cargoHash = "sha256-vxDyao9pX/CfS08vFmq3vXtgDIg5NXlEwpzroGW48dA="; + cargoHash = "sha256-wLJlaV59sAo97KI6Ekw42aaG6hVkul1wFvcC+71+Zp4="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles From 349c2206cae116051892c2e56fbd5ff49939f25d Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 23 Aug 2025 11:55:22 +0200 Subject: [PATCH 31/61] varnish77: 7.7.2 -> 7.7.3 Changes: https://varnish-cache.org/releases/rel7.7.3.html --- pkgs/servers/varnish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 719bbf9a20e8..ad5e6b3db6ed 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -114,7 +114,7 @@ in }; # EOL 2026-03-15 varnish77 = common { - version = "7.7.2"; - hash = "sha256-/ad1DhKBog6czMbGZkgdJDf6fA2BZZLIbk+3un/EZK0="; + version = "7.7.3"; + hash = "sha256-6W7q/Ez+KlWO0vtU8eIr46PZlfRvjADaVF1YOq74AjY="; }; } From 6c206d964d3e7e7219787f3eb2db5dc240f701b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Jul 2025 00:43:32 +0000 Subject: [PATCH 32/61] kdePackages.packagekit-qt: 1.1.2 -> 1.1.3 --- pkgs/tools/package-management/packagekit/qt.nix | 12 +++--------- pkgs/top-level/qt5-packages.nix | 2 -- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index 1cce9329b6f4..ff156cf8559b 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -1,6 +1,5 @@ { stdenv, - lib, fetchFromGitHub, cmake, pkg-config, @@ -8,18 +7,15 @@ packagekit, }: -let - isQt6 = lib.versions.major qttools.version == "6"; -in stdenv.mkDerivation rec { pname = "packagekit-qt"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "hughsie"; repo = "PackageKit-Qt"; - rev = "v${version}"; - sha256 = "sha256-rLNeVjzIT18qUZgj6Qcf7E59CL4gx/ArYJfs9KHrqNs="; + tag = "v${version}"; + hash = "sha256-ZHkOFPaOMLCectYKzQs9oQ70kv8APOdkjDRimHgld+c="; }; buildInputs = [ packagekit ]; @@ -30,8 +26,6 @@ stdenv.mkDerivation rec { qttools ]; - cmakeFlags = [ (lib.cmakeBool "BUILD_WITH_QT6" isQt6) ]; - dontWrapQtApps = true; meta = packagekit.meta // { diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 9200d884c129..f5f8871f8a86 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -129,8 +129,6 @@ makeScopeWithSplicing' { libopenshot = callPackage ../development/libraries/libopenshot { }; - packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; - libopenshot-audio = callPackage ../development/libraries/libopenshot-audio { }; libqglviewer = callPackage ../development/libraries/libqglviewer { }; From d69cda222b6404c7ee78d250cdc905091693a8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 23 Aug 2025 19:59:45 +0200 Subject: [PATCH 33/61] paperless-ngx: clean up pythonRelaxDeps --- pkgs/by-name/pa/paperless-ngx/package.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index f191fea5795a..1fb2305a4cdd 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -168,16 +168,8 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ - "django" "django-allauth" - "django-auditlog" - "django-guardian" - "django-multiselectfield" - "imap-tools" - "pathvalidate" "redis" - "scikit-learn" - "tika-client" ]; dependencies = From c29a92fb46069d6c608eb8dc4d4121d74b0f318d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 23 Aug 2025 20:09:18 +0200 Subject: [PATCH 34/61] paperless-ngx: 2.18.1 -> 2.28.2 Changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.18.2 --- pkgs/by-name/pa/paperless-ngx/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 1fb2305a4cdd..80143f6e9599 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -29,13 +29,13 @@ xorg, }: let - version = "2.18.1"; + version = "2.18.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-POHF00cV8pl6i1rcwxtZ+Q1AlLybDj6gSlL0lPwSSCo="; + hash = "sha256-JaDeOiubu9VE8E/u2K9BS7GLNSTqXTcX926WhPMGd64="; }; python = python3.override { From d06b6e8bda2f3fb5251fa2d7c399081932e1c76f Mon Sep 17 00:00:00 2001 From: FlameFlag <57304299+FlameFlag@users.noreply.github.com> Date: Sat, 23 Aug 2025 23:34:57 +0300 Subject: [PATCH 35/61] arc-browser: 1.106.0-66192 -> 1.109.0-67185 --- pkgs/by-name/ar/arc-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index 35d609920f94..8dcedf453eb2 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.106.0-66192"; + version = "1.109.0-67185"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-AlM0wJ/2okrxw2ZpMPodlSVQaMMkBPf5iIN4bnMTaME="; + hash = "sha256-zVErRSKMd5xhIB5fyawBNEatenHnm+q7VLAE78PLkmY="; }; nativeBuildInputs = [ undmg ]; From ee57b87f5f32c9dd4ef176bef110fa9009683197 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 24 Aug 2025 01:14:31 +0200 Subject: [PATCH 36/61] python3Packages.compressed-tensors: 0.10.2 -> 0.11.0 Diff: https://github.com/neuralmagic/compressed-tensors/compare/0.10.2...0.11.0 Changelog: https://github.com/neuralmagic/compressed-tensors/releases/tag/0.11.0 --- .../compressed-tensors/default.nix | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/compressed-tensors/default.nix b/pkgs/development/python-modules/compressed-tensors/default.nix index 4c5eea81b0b6..3c6fd45b0ebc 100644 --- a/pkgs/development/python-modules/compressed-tensors/default.nix +++ b/pkgs/development/python-modules/compressed-tensors/default.nix @@ -1,12 +1,19 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, + setuptools-scm, + + # dependencies + frozendict, pydantic, torch, transformers, + + # tests nbconvert, nbformat, pytestCheckHook, @@ -14,7 +21,7 @@ buildPythonPackage rec { pname = "compressed-tensors"; - version = "0.10.2"; + version = "0.11.0"; pyproject = true; # Release on PyPI is missing the `utils` directory, which `setup.py` wants to import @@ -22,12 +29,21 @@ buildPythonPackage rec { owner = "neuralmagic"; repo = "compressed-tensors"; tag = version; - hash = "sha256-BJsMyCs+rupt5+i5JlO7oY08Udc8hI3ZnMiN+8ja0mc="; + hash = "sha256-sSXn4/N/Pn+wOCY1Z0ziqFxfMRvRA1c90jPOBe+SwZw="; }; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools_scm==8.2.0" "setuptools_scm" + ''; + + build-system = [ + setuptools + setuptools-scm + ]; dependencies = [ + frozendict pydantic torch transformers @@ -45,12 +61,17 @@ buildPythonPackage rec { disabledTests = [ # these try to download models from HF Hub + "test_apply_tinyllama_dynamic_activations" + "test_compress_model" + "test_compress_model_meta" + "test_compressed_linear_from_linear_usage" + "test_decompress_model" "test_get_observer_token_count" "test_kv_cache_quantization" - "test_target_prioritization" "test_load_compressed_sharded" + "test_model_forward_pass" "test_save_compressed_model" - "test_apply_tinyllama_dynamic_activations" + "test_target_prioritization" ]; disabledTestPaths = [ From a72c704caa4d5f3a7efca286f3ff790edb007999 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 Aug 2025 11:17:00 +0000 Subject: [PATCH 37/61] networkmanager-openvpn: 1.12.0 -> 1.12.2 --- pkgs/by-name/ne/networkmanager-openvpn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix index 56e02c52ea7b..0271e693bde8 100644 --- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix +++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "NetworkManager-openvpn"; - version = "1.12.0"; + version = "1.12.2"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor finalAttrs.version}/NetworkManager-openvpn-${finalAttrs.version}.tar.xz"; - sha256 = "kD/UwK69KqescMnYwr7Y35ImVdItdkUUQDVmrom36IY="; + sha256 = "qhtfmt341kvIxFk2HPDV4+uZ8Utg6oKjUAYxkor2Km8="; }; patches = [ From 9aca6057ebbdc81a0c4e57b1264d23065a7a2386 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Aug 2025 13:07:08 +0000 Subject: [PATCH 38/61] typos-lsp: 0.1.40 -> 0.1.41 --- pkgs/by-name/ty/typos-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix index 1e9a9148bb2f..2dfc93d878f4 100644 --- a/pkgs/by-name/ty/typos-lsp/package.nix +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "typos-lsp"; # Please update the corresponding VSCode extension too. # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix - version = "0.1.40"; + version = "0.1.41"; src = fetchFromGitHub { owner = "tekumara"; repo = "typos-lsp"; tag = "v${version}"; - hash = "sha256-O8TikrjFpmZ7PX7KmnErMW3OE6BoAlSAeZGD9qOEfog="; + hash = "sha256-DJnq0PtRGYRgC0JhR8myeIddBTAvP+Ey3+qEZi75EmQ="; }; - cargoHash = "sha256-V6uYmnsbWuQc002hdDfc/B1mzrS7xu0xcR/6m2oxyMU="; + cargoHash = "sha256-OSTPVLVLl3LaijEorcSSscOMiDfgIGRXSvaFMKJ+hq0="; # fix for compilation on aarch64 # see https://github.com/NixOS/nixpkgs/issues/145726 From 48f3c9e441d2080fde07537e2f6ded26ddba4baa Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 24 Aug 2025 13:18:46 +0200 Subject: [PATCH 39/61] vscode-extensions.tekumara.typos-vscode: 0.1.40 -> 0.1.41 --- .../extensions/tekumara.typos-vscode/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index 079afeaf0cc4..f681eb3b11e2 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -14,19 +14,19 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-lxslDmnBA5TSFH/5J5Mt/TYsiE+5noQXCnHKAfA7mko="; + hash = "sha256-2hmkSgS3r4ghAXA8E0blWhe7kLvtZoApSRWXf6Ff5AE="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-hCRtlgRNO49D9YrmPcw+guNwk6RE+mLi9MrJTKI+FdU="; + hash = "sha256-XVygGMHtEhk+Fttd/xdZr5Yau9P3yCSo43RrXhqh/PQ="; }; x86_64-darwin = { arch = "darwin-x64"; - hash = "sha256-CCsYPdiepfKa5s51ZZT/Rn9PoI4IKzGV+ztNkoQb9eo="; + hash = "sha256-8awJFJVSo6ru3ej4utkTF/5eK4dMw63Z3KHNHRRFSBs="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-JOJf5JI46eBjSJ26aIe2nJ8TGHFsXsDNkIoCV9upSRA="; + hash = "sha256-JNik8Q9/BDjjuLVNJFOazyH9/a4s2HmkuENLQlDdKP4="; }; } .${system} or (throw "Unsupported system: ${system}"); @@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension { # Please update the corresponding binary (typos-lsp) # when updating this extension. # See pkgs/by-name/ty/typos-lsp/package.nix - version = "0.1.40"; + version = "0.1.41"; inherit (extInfo) hash arch; }; From 91202448f8d8361e1c7c862ab74b82e6e0f523af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Aug 2025 13:43:16 +0000 Subject: [PATCH 40/61] kodiPackages.netflix: 1.23.4 -> 1.23.5 --- pkgs/applications/video/kodi/addons/netflix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/netflix/default.nix b/pkgs/applications/video/kodi/addons/netflix/default.nix index 76ec7fd1d242..4d61e5c73ef5 100644 --- a/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -12,13 +12,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.23.4"; + version = "1.23.5"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - hash = "sha256-yq5XNhKQSBh7r/2apHXLMjhovV6xhL9DcDwXn9nt0KQ="; + hash = "sha256-IIRut99AH08Z3udTkzUf2wz7dQMA94dOnfROm7iM9RM="; }; propagatedBuildInputs = [ From c895484283cae1c2faa5904dfa9d354f26512d43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Aug 2025 14:44:46 +0000 Subject: [PATCH 41/61] _86Box-with-roms: 4.2.1 -> 5.0 --- pkgs/by-name/_8/_86Box/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/_8/_86Box/package.nix b/pkgs/by-name/_8/_86Box/package.nix index 4e2cdb3eac5e..a0f912d7c547 100644 --- a/pkgs/by-name/_8/_86Box/package.nix +++ b/pkgs/by-name/_8/_86Box/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "86Box"; - version = "4.2.1"; + version = "5.0"; src = fetchFromGitHub { owner = "86Box"; repo = "86Box"; tag = "v${finalAttrs.version}"; - hash = "sha256-ue5Coy2MpP7Iwl81KJPQPC7eD53/Db5a0PGIR+DdPYI="; + hash = "sha256-vuVaV87BHgqiEDyaRqiqqT1AuBuPSMHs0d+/mT4cEuk="; }; patches = [ ./darwin.patch ]; @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "86Box"; repo = "roms"; tag = "v${finalAttrs.version}"; - hash = "sha256-p3djn950mTUIchFCEg56JbJtIsUuxmqRdYFRl50kI5Y="; + hash = "sha256-bMCmDAdGTkO3BuU0EBC1svulZYP3tPqWBELbXwV0KO8="; }; updateScript = ./update.sh; }; From 40ab1553c4fac2dafb3ab18b4710670282cbaade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 18 Aug 2025 10:45:16 -0600 Subject: [PATCH 42/61] gst_all_1.gst-plugins-rs: disable tests Tests disabled due to failing tests blocking unstable channel and no fix being found in several days Test failures: https://cache.nixos.org/log/0j86pshk6xb0cnqxq64f007ws0b7yzbb-gst-plugins-rs-0.14.1.drv Upstream issue: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723 --- .../libraries/gstreamer/rs/default.nix | 7 +--- .../gstreamer/rs/ignore-network-tests.patch | 12 ------ .../libraries/gstreamer/rs/ignore-tests.patch | 40 +++++++++++++++++++ 3 files changed, 42 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/libraries/gstreamer/rs/ignore-network-tests.patch create mode 100644 pkgs/development/libraries/gstreamer/rs/ignore-tests.patch diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index d1f33e7951d8..aff3768552fb 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -187,11 +187,8 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - # Disable uriplaylistbin test that requires network access. - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/676 - # TODO: Remove in 0.14, it has been replaced by a different fix: - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/2140 - ./ignore-network-tests.patch + # Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723 + ./ignore-tests.patch ]; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-network-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-network-tests.patch deleted file mode 100644 index 22bcce3f2e37..000000000000 --- a/pkgs/development/libraries/gstreamer/rs/ignore-network-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs -index dfd1c9ce..8ed24949 100644 ---- a/utils/uriplaylistbin/tests/uriplaylistbin.rs -+++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs -@@ -534,6 +534,7 @@ fn infinite_to_finite() { - assert_eq!(current_uri_index, 0); - } - -+#[ignore = "Requires network access"] - #[test] - /// cache HTTP playlist items - fn cache() { diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch new file mode 100644 index 000000000000..63c053f9a066 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch @@ -0,0 +1,40 @@ +diff --git a/mux/mp4/tests/tests.rs b/mux/mp4/tests/tests.rs +index 52b91f59..c5875554 100644 +--- a/mux/mp4/tests/tests.rs ++++ b/mux/mp4/tests/tests.rs +@@ -1339,6 +1339,7 @@ fn test_taic_encode_cannot_sync(video_enc: &str) { + ); + } + ++#[ignore = "Unknown failure"] + #[test] + fn test_taic_x264() { + init(); +@@ -1359,6 +1360,7 @@ fn test_taic_stai_x264_not_enabled() { + test_taic_stai_encode("x264enc", false); + } + ++#[ignore = "Unknown failure"] + #[test] + fn test_taic_x264_no_sync() { + init(); +diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs +index 3489eaa8..569635d6 100644 +--- a/utils/uriplaylistbin/tests/uriplaylistbin.rs ++++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs +@@ -388,6 +388,7 @@ fn multi_audio() { + assert_eq!(current_uri_index, 2); + } + ++#[ignore = "Unknown failure"] + #[test] + fn multi_audio_video() { + let (_events, current_iteration, current_uri_index, eos) = test( +@@ -403,6 +404,7 @@ fn multi_audio_video() { + assert_eq!(current_uri_index, 1); + } + ++#[ignore = "Unknown failure"] + #[test] + fn iterations() { + let (_events, current_iteration, current_uri_index, eos) = test( From 9f15e04f1884c9c560055a2e0266aaed0cae1d29 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 24 Aug 2025 19:29:47 +0200 Subject: [PATCH 43/61] maintainers: drop ertes Last activity in 2014. --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/do/doom-bcc/package.nix | 1 - pkgs/by-name/pa/pari/package.nix | 1 - pkgs/by-name/pi/picom/package.nix | 1 - pkgs/games/doom-ports/slade/git.nix | 1 - 5 files changed, 10 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f15b37b74964..388a3a8a1332 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7790,12 +7790,6 @@ githubId = 5427394; name = "Ersin Akinci"; }; - ertes = { - email = "esz@posteo.de"; - github = "ertes"; - githubId = 1855930; - name = "Ertugrul Söylemez"; - }; esau79p = { github = "EsAu79p"; githubId = 21313906; diff --git a/pkgs/by-name/do/doom-bcc/package.nix b/pkgs/by-name/do/doom-bcc/package.nix index 3c78b892970c..99e03b0ab19c 100644 --- a/pkgs/by-name/do/doom-bcc/package.nix +++ b/pkgs/by-name/do/doom-bcc/package.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation { mainProgram = "bcc"; homepage = "https://github.com/wormt/bcc"; license = licenses.mit; - maintainers = with maintainers; [ ertes ]; }; } diff --git a/pkgs/by-name/pa/pari/package.nix b/pkgs/by-name/pa/pari/package.nix index d51d6875cbc2..af5bc9bbabfb 100644 --- a/pkgs/by-name/pa/pari/package.nix +++ b/pkgs/by-name/pa/pari/package.nix @@ -78,7 +78,6 @@ stdenv.mkDerivation rec { ''; downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ertes ]; teams = [ teams.sage ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "gp"; diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix index 6a54b69fc98a..f1a0b3076827 100644 --- a/pkgs/by-name/pi/picom/package.nix +++ b/pkgs/by-name/pi/picom/package.nix @@ -131,7 +131,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/yshui/picom"; mainProgram = "picom"; maintainers = with lib.maintainers; [ - ertes gepbird thiagokokada twey diff --git a/pkgs/games/doom-ports/slade/git.nix b/pkgs/games/doom-ports/slade/git.nix index baded118f8d7..c5d0f94a0ce3 100644 --- a/pkgs/games/doom-ports/slade/git.nix +++ b/pkgs/games/doom-ports/slade/git.nix @@ -74,6 +74,5 @@ stdenv.mkDerivation { homepage = "http://slade.mancubus.net/"; license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754 platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ertes ]; }; } From 4c5513d312bf139a3b51d06c81c0888b823feee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 24 Aug 2025 11:30:37 -0600 Subject: [PATCH 44/61] mopidy: remove upstreamed patch --- pkgs/applications/audio/mopidy/mopidy.nix | 17 +- .../mopidy/spotify-access-token-auth.patch | 2207 ----------------- .../libraries/gstreamer/rs/default.nix | 6 - 3 files changed, 1 insertion(+), 2229 deletions(-) delete mode 100644 pkgs/applications/audio/mopidy/spotify-access-token-auth.patch diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index d4446a098ffa..b0beb5a8a516 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -33,22 +33,7 @@ pythonPackages.buildPythonApplication rec { gst-plugins-base gst-plugins-good gst-plugins-ugly - # Required patches for the Spotify plugin (https://github.com/mopidy/mopidy-spotify/releases/tag/v5.0.0a3) - (gst-plugins-rs.overrideAttrs ( - newAttrs: oldAttrs: { - cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': { - vendorStaging = oldAttrs'.vendorStaging.overrideAttrs { - inherit (newAttrs) patches; - outputHash = "sha256-urRYH5N1laBq1/SUEmwFKAtsHAC+KWYfYp+fmb7Ey7s="; - }; - }); - - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1801/ - patches = oldAttrs.patches or [ ] ++ [ - ./spotify-access-token-auth.patch - ]; - } - )) + gst-plugins-rs ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pipewire ]; diff --git a/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch b/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch deleted file mode 100644 index 3f5ccc49ef8b..000000000000 --- a/pkgs/applications/audio/mopidy/spotify-access-token-auth.patch +++ /dev/null @@ -1,2207 +0,0 @@ -From b66aac80f433dc3301be26e379f2ecea6fbbf990 Mon Sep 17 00:00:00 2001 -From: Guillaume Desmottes -Date: Wed, 15 Dec 2021 17:15:20 +0100 -Subject: [PATCH] spotify: replace username/password auth with access token. - -Part-of: ---- - Cargo.lock | 1082 +++++++++++++++++----- - audio/spotify/Cargo.toml | 6 +- - audio/spotify/README.md | 25 +- - audio/spotify/src/common.rs | 141 ++- - audio/spotify/src/spotifyaudiosrc/imp.rs | 19 +- - docs/plugins/gst_plugins_cache.json | 12 + - 6 files changed, 973 insertions(+), 312 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 244256cd..226254e3 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -19,45 +19,13 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - - [[package]] - name = "aes" --version = "0.6.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" --dependencies = [ -- "aes-soft", -- "aesni", -- "cipher", --] -- --[[package]] --name = "aes-ctr" --version = "0.6.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7729c3cde54d67063be556aeac75a81330d802f0259500ca40cb52967f975763" --dependencies = [ -- "aes-soft", -- "aesni", -- "cipher", -- "ctr", --] -- --[[package]] --name = "aes-soft" --version = "0.6.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" --dependencies = [ -- "cipher", -- "opaque-debug", --] -- --[[package]] --name = "aesni" --version = "0.10.0" -+version = "0.8.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" - dependencies = [ -+ "cfg-if", - "cipher", -- "opaque-debug", -+ "cpufeatures", - ] - - [[package]] -@@ -370,6 +338,29 @@ dependencies = [ - "zeroize", - ] - -+[[package]] -+name = "aws-lc-rs" -+version = "1.13.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878" -+dependencies = [ -+ "aws-lc-sys", -+ "zeroize", -+] -+ -+[[package]] -+name = "aws-lc-sys" -+version = "0.28.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b9f7720b74ed28ca77f90769a71fd8c637a0137f6fae4ae947e1050229cff57f" -+dependencies = [ -+ "bindgen", -+ "cc", -+ "cmake", -+ "dunce", -+ "fs_extra", -+] -+ - [[package]] - name = "aws-runtime" - version = "1.2.0" -@@ -461,7 +452,7 @@ dependencies = [ - "bytes", - "fastrand", - "hex", -- "hmac 0.12.1", -+ "hmac", - "http 0.2.12", - "http-body 0.4.6", - "lru 0.12.5", -@@ -603,7 +594,7 @@ dependencies = [ - "crypto-bigint 0.5.5", - "form_urlencoded", - "hex", -- "hmac 0.12.1", -+ "hmac", - "http 0.2.12", - "http 1.2.0", - "once_cell", -@@ -869,6 +860,29 @@ dependencies = [ - "serde", - ] - -+[[package]] -+name = "bindgen" -+version = "0.69.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" -+dependencies = [ -+ "bitflags 2.9.0", -+ "cexpr", -+ "clang-sys", -+ "itertools 0.12.1", -+ "lazy_static", -+ "lazycell", -+ "log", -+ "prettyplease", -+ "proc-macro2", -+ "quote", -+ "regex", -+ "rustc-hash 1.1.0", -+ "shlex", -+ "syn 2.0.99", -+ "which", -+] -+ - [[package]] - name = "bitflags" - version = "1.3.2" -@@ -887,15 +901,6 @@ version = "2.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" - --[[package]] --name = "block-buffer" --version = "0.9.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" --dependencies = [ -- "generic-array", --] -- - [[package]] - name = "block-buffer" - version = "0.10.4" -@@ -1041,6 +1046,15 @@ dependencies = [ - "thiserror 2.0.12", - ] - -+[[package]] -+name = "cexpr" -+version = "0.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -+dependencies = [ -+ "nom 7.1.3", -+] -+ - [[package]] - name = "cfg-expr" - version = "0.15.8" -@@ -1090,11 +1104,23 @@ dependencies = [ - - [[package]] - name = "cipher" --version = "0.2.5" -+version = "0.4.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" - dependencies = [ -- "generic-array", -+ "crypto-common", -+ "inout", -+] -+ -+[[package]] -+name = "clang-sys" -+version = "1.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" -+dependencies = [ -+ "glob", -+ "libc", -+ "libloading", - ] - - [[package]] -@@ -1143,6 +1169,15 @@ version = "0.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" - -+[[package]] -+name = "cmake" -+version = "0.1.54" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" -+dependencies = [ -+ "cc", -+] -+ - [[package]] - name = "color-name" - version = "1.1.0" -@@ -1233,6 +1268,16 @@ dependencies = [ - "libc", - ] - -+[[package]] -+name = "core-foundation" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+] -+ - [[package]] - name = "core-foundation-sys" - version = "0.8.7" -@@ -1332,16 +1377,6 @@ dependencies = [ - "typenum", - ] - --[[package]] --name = "crypto-mac" --version = "0.11.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" --dependencies = [ -- "generic-array", -- "subtle", --] -- - [[package]] - name = "csound" - version = "0.1.8" -@@ -1366,9 +1401,9 @@ dependencies = [ - - [[package]] - name = "ctr" --version = "0.6.0" -+version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" -+checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" - dependencies = [ - "cipher", - ] -@@ -1434,7 +1469,7 @@ dependencies = [ - "iso8601", - "lazy_static", - "num-traits", -- "quick-xml", -+ "quick-xml 0.37.2", - "regex", - "serde", - "serde_path_to_error", -@@ -1499,6 +1534,17 @@ dependencies = [ - "zeroize", - ] - -+[[package]] -+name = "der" -+version = "0.7.9" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0" -+dependencies = [ -+ "const-oid", -+ "pem-rfc7468", -+ "zeroize", -+] -+ - [[package]] - name = "deranged" - version = "0.3.11" -@@ -1510,27 +1556,50 @@ dependencies = [ - ] - - [[package]] --name = "diff" --version = "0.1.13" -+name = "derive_builder" -+version = "0.20.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -+dependencies = [ -+ "derive_builder_macro", -+] - - [[package]] --name = "digest" --version = "0.9.0" -+name = "derive_builder_core" -+version = "0.20.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" - dependencies = [ -- "generic-array", -+ "darling", -+ "proc-macro2", -+ "quote", -+ "syn 2.0.99", -+] -+ -+[[package]] -+name = "derive_builder_macro" -+version = "0.20.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -+dependencies = [ -+ "derive_builder_core", -+ "syn 2.0.99", - ] - -+[[package]] -+name = "diff" -+version = "0.1.13" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" -+ - [[package]] - name = "digest" - version = "0.10.7" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" - dependencies = [ -- "block-buffer 0.10.4", -+ "block-buffer", -+ "const-oid", - "crypto-common", - "subtle", - ] -@@ -1567,6 +1636,12 @@ dependencies = [ - "rgb", - ] - -+[[package]] -+name = "dunce" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" -+ - [[package]] - name = "ebml-iterable" - version = "0.6.3" -@@ -1614,10 +1689,10 @@ version = "0.14.8" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" - dependencies = [ -- "der", -+ "der 0.6.1", - "elliptic-curve", - "rfc6979", -- "signature", -+ "signature 1.6.4", - ] - - [[package]] -@@ -1626,7 +1701,7 @@ version = "1.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" - dependencies = [ -- "signature", -+ "signature 1.6.4", - ] - - [[package]] -@@ -1643,12 +1718,12 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" - dependencies = [ - "base16ct", - "crypto-bigint 0.4.9", -- "der", -- "digest 0.10.7", -+ "der 0.6.1", -+ "digest", - "ff", - "generic-array", - "group", -- "pkcs8", -+ "pkcs8 0.9.0", - "rand_core 0.6.4", - "sec1", - "subtle", -@@ -1856,6 +1931,12 @@ dependencies = [ - "autocfg", - ] - -+[[package]] -+name = "fs_extra" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" -+ - [[package]] - name = "fst" - version = "0.4.7" -@@ -1933,6 +2014,12 @@ version = "0.3.31" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" - -+[[package]] -+name = "futures-timer" -+version = "3.0.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" -+ - [[package]] - name = "futures-util" - version = "0.3.31" -@@ -2209,6 +2296,24 @@ dependencies = [ - "system-deps 7.0.3", - ] - -+[[package]] -+name = "governor" -+version = "0.6.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" -+dependencies = [ -+ "cfg-if", -+ "futures", -+ "futures-timer", -+ "no-std-compat", -+ "nonzero_ext", -+ "parking_lot", -+ "portable-atomic", -+ "rand 0.8.5", -+ "smallvec", -+ "spinning_top", -+] -+ - [[package]] - name = "graphene-rs" - version = "0.20.9" -@@ -2488,7 +2593,7 @@ dependencies = [ - "gstreamer-video", - "m3u8-rs", - "once_cell", -- "quick-xml", -+ "quick-xml 0.37.2", - "serde", - ] - -@@ -2680,7 +2785,7 @@ dependencies = [ - "gstreamer-video", - "libloading", - "once_cell", -- "quick-xml", -+ "quick-xml 0.37.2", - "smallvec", - "thiserror 2.0.12", - ] -@@ -3763,21 +3868,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - - [[package]] - name = "hmac" --version = "0.11.0" -+version = "0.12.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" - dependencies = [ -- "crypto-mac", -- "digest 0.9.0", -+ "digest", - ] - - [[package]] --name = "hmac" --version = "0.12.1" -+name = "home" -+version = "0.5.11" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" - dependencies = [ -- "digest 0.10.7", -+ "windows-sys 0.59.0", - ] - - [[package]] -@@ -3923,18 +4027,24 @@ dependencies = [ - ] - - [[package]] --name = "hyper-proxy" --version = "0.9.1" -+name = "hyper-proxy2" -+version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" -+checksum = "9043b7b23fb0bc4a1c7014c27b50a4fc42cc76206f71d34fc0dfe5b28ddc3faf" - dependencies = [ - "bytes", -- "futures", -- "headers 0.3.9", -- "http 0.2.12", -- "hyper 0.14.32", -+ "futures-util", -+ "headers 0.4.0", -+ "http 1.2.0", -+ "hyper 1.6.0", -+ "hyper-rustls 0.26.0", -+ "hyper-util", -+ "pin-project-lite", -+ "rustls-native-certs 0.7.3", - "tokio", -+ "tokio-rustls 0.25.0", - "tower-service", -+ "webpki", - ] - - [[package]] -@@ -3948,11 +4058,30 @@ dependencies = [ - "hyper 0.14.32", - "log", - "rustls 0.21.12", -- "rustls-native-certs", -+ "rustls-native-certs 0.6.3", - "tokio", - "tokio-rustls 0.24.1", - ] - -+[[package]] -+name = "hyper-rustls" -+version = "0.26.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" -+dependencies = [ -+ "futures-util", -+ "http 1.2.0", -+ "hyper 1.6.0", -+ "hyper-util", -+ "log", -+ "rustls 0.22.4", -+ "rustls-native-certs 0.7.3", -+ "rustls-pki-types", -+ "tokio", -+ "tokio-rustls 0.25.0", -+ "tower-service", -+] -+ - [[package]] - name = "hyper-rustls" - version = "0.27.5" -@@ -3963,7 +4092,9 @@ dependencies = [ - "http 1.2.0", - "hyper 1.6.0", - "hyper-util", -+ "log", - "rustls 0.23.23", -+ "rustls-native-certs 0.8.1", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.26.2", -@@ -4052,7 +4183,7 @@ dependencies = [ - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", -- "windows-core", -+ "windows-core 0.52.0", - ] - - [[package]] -@@ -4261,6 +4392,15 @@ dependencies = [ - "serde", - ] - -+[[package]] -+name = "inout" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" -+dependencies = [ -+ "generic-array", -+] -+ - [[package]] - name = "interpolate_name" - version = "0.2.4" -@@ -4372,6 +4512,15 @@ name = "lazy_static" - version = "1.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -+dependencies = [ -+ "spin", -+] -+ -+[[package]] -+name = "lazycell" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - - [[package]] - name = "lewton" -@@ -4380,7 +4529,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" - dependencies = [ - "byteorder", -- "ogg", - "tinyvec", - ] - -@@ -4418,108 +4566,141 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" - - [[package]] - name = "librespot-audio" --version = "0.4.2" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c176a31355e1ea8e0b9c4ced19df4947bfe4770661c25c142b6fba2365940d9d" -+checksum = "5fbda070a5598b32718e497f585f46891f7113e64aff20a13c0f2ba8fe7ccad9" - dependencies = [ -- "aes-ctr", -- "byteorder", -+ "aes", - "bytes", -+ "ctr", - "futures-util", -+ "http-body-util", -+ "hyper 1.6.0", -+ "hyper-util", - "librespot-core", - "log", -+ "parking_lot", - "tempfile", -+ "thiserror 1.0.69", - "tokio", - ] - - [[package]] - name = "librespot-core" --version = "0.4.2" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "046349f25888e644bf02d9c5de0164b2a493d29aa4ce18e1ad0b756da9b55d6d" -+checksum = "505a5ddd966231755994b60435607a1e8ae1d41c7f1169b078e0511bfb82d931" - dependencies = [ - "aes", -- "base64 0.13.1", -+ "base64 0.22.1", - "byteorder", - "bytes", -+ "data-encoding", - "form_urlencoded", - "futures-core", - "futures-util", -- "hmac 0.11.0", -- "http 0.2.12", -+ "governor", -+ "hmac", -+ "http 1.2.0", -+ "http-body-util", - "httparse", -- "hyper 0.14.32", -- "hyper-proxy", -+ "hyper 1.6.0", -+ "hyper-proxy2", -+ "hyper-rustls 0.27.5", -+ "hyper-util", -+ "librespot-oauth", - "librespot-protocol", - "log", -+ "nonzero_ext", - "num-bigint", -+ "num-derive", - "num-integer", - "num-traits", - "once_cell", -+ "parking_lot", - "pbkdf2", -+ "pin-project-lite", - "priority-queue", - "protobuf", -+ "quick-xml 0.36.2", - "rand 0.8.5", -+ "rsa", - "serde", - "serde_json", -- "sha-1", -+ "sha1", - "shannon", -+ "sysinfo", - "thiserror 1.0.69", -+ "time", - "tokio", - "tokio-stream", -+ "tokio-tungstenite 0.24.0", - "tokio-util", - "url", - "uuid", -- "vergen", -+ "vergen-gitcl", - ] - - [[package]] - name = "librespot-metadata" --version = "0.4.2" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6b80361fcbcb5092056fd47c08c34d5d51b08385d8efb6941c0d3e46d032c21c" -+checksum = "6a10ab5a390f65281e763cd09c617b173f0e665994eae3d242526924625fdc66" - dependencies = [ - "async-trait", -- "byteorder", -+ "bytes", - "librespot-core", - "librespot-protocol", - "log", - "protobuf", -+ "serde", -+ "serde_json", -+ "thiserror 1.0.69", -+ "uuid", - ] - - [[package]] --name = "librespot-playback" --version = "0.4.2" -+name = "librespot-oauth" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5190a0b9bcc7f70ee4196a6b4a1c731d405ca130d4a6fcd4c561cfdde8b7cfb7" -+checksum = "57bda94233b358fb41c04ed15507c61136c80efe876c6e05a10ddb9a182b144e" - dependencies = [ -- "byteorder", -- "futures-executor", -- "futures-util", -- "lewton", -- "librespot-audio", -- "librespot-core", -- "librespot-metadata", - "log", -- "ogg", -+ "oauth2", -+ "thiserror 1.0.69", -+ "url", -+] -+ -+[[package]] -+name = "librespot-playback" -+version = "0.5.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b1bcfe1d72c5ac14c798c7e3e1c20e1fb6af2b9c254794545cfcb1f2a4627e2" -+dependencies = [ -+ "futures-util", -+ "librespot-audio", -+ "librespot-core", -+ "librespot-metadata", -+ "log", -+ "ogg", - "parking_lot", - "rand 0.8.5", - "rand_distr", - "shell-words", -+ "symphonia", - "thiserror 1.0.69", - "tokio", -- "zerocopy 0.6.6", -+ "zerocopy 0.7.35", - ] - - [[package]] - name = "librespot-protocol" --version = "0.4.2" -+version = "0.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5d6d3ac6196ac0ea67bbe039f56d6730a5d8b31502ef9bce0f504ed729dcb39f" -+checksum = "0d6f343f573e0469d3ff8a02b99bbd9789faa01e2ff167332542ac840a8b31e7" - dependencies = [ -- "glob", - "protobuf", -- "protobuf-codegen-pure", -+ "protobuf-codegen", - ] - - [[package]] -@@ -4674,7 +4855,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" - dependencies = [ - "cfg-if", -- "digest 0.10.7", -+ "digest", - ] - - [[package]] -@@ -4801,7 +4982,7 @@ dependencies = [ - "openssl-probe", - "openssl-sys", - "schannel", -- "security-framework", -+ "security-framework 2.11.1", - "security-framework-sys", - "tempfile", - ] -@@ -4834,6 +5015,12 @@ dependencies = [ - "rustfft", - ] - -+[[package]] -+name = "no-std-compat" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" -+ - [[package]] - name = "nom" - version = "7.1.3" -@@ -4853,12 +5040,27 @@ dependencies = [ - "memchr", - ] - -+[[package]] -+name = "nonzero_ext" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" -+ - [[package]] - name = "noop_proc_macro" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" - -+[[package]] -+name = "ntapi" -+version = "0.4.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -+dependencies = [ -+ "winapi", -+] -+ - [[package]] - name = "nu-ansi-term" - version = "0.46.0" -@@ -4880,6 +5082,23 @@ dependencies = [ - "rand 0.8.5", - ] - -+[[package]] -+name = "num-bigint-dig" -+version = "0.8.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -+dependencies = [ -+ "byteorder", -+ "lazy_static", -+ "libm", -+ "num-integer", -+ "num-iter", -+ "num-traits", -+ "rand 0.8.5", -+ "smallvec", -+ "zeroize", -+] -+ - [[package]] - name = "num-complex" - version = "0.4.6" -@@ -4915,6 +5134,17 @@ dependencies = [ - "num-traits", - ] - -+[[package]] -+name = "num-iter" -+version = "0.1.45" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" -+dependencies = [ -+ "autocfg", -+ "num-integer", -+ "num-traits", -+] -+ - [[package]] - name = "num-rational" - version = "0.4.2" -@@ -4947,6 +5177,35 @@ dependencies = [ - "libc", - ] - -+[[package]] -+name = "num_threads" -+version = "0.1.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -+dependencies = [ -+ "libc", -+] -+ -+[[package]] -+name = "oauth2" -+version = "4.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" -+dependencies = [ -+ "base64 0.13.1", -+ "chrono", -+ "getrandom 0.2.15", -+ "http 0.2.12", -+ "rand 0.8.5", -+ "reqwest 0.11.27", -+ "serde", -+ "serde_json", -+ "serde_path_to_error", -+ "sha2", -+ "thiserror 1.0.69", -+ "url", -+] -+ - [[package]] - name = "object" - version = "0.36.7" -@@ -4958,9 +5217,9 @@ dependencies = [ - - [[package]] - name = "ogg" --version = "0.8.0" -+version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" -+checksum = "fdab8dcd8d4052eaacaf8fb07a3ccd9a6e26efadb42878a413c68fc4af1dee2b" - dependencies = [ - "byteorder", - ] -@@ -4971,12 +5230,6 @@ version = "1.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" - --[[package]] --name = "opaque-debug" --version = "0.3.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" -- - [[package]] - name = "openssl" - version = "0.10.71" -@@ -5188,12 +5441,12 @@ dependencies = [ - - [[package]] - name = "pbkdf2" --version = "0.8.0" -+version = "0.12.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" -+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" - dependencies = [ -- "crypto-mac", -- "hmac 0.11.0", -+ "digest", -+ "hmac", - ] - - [[package]] -@@ -5206,6 +5459,15 @@ dependencies = [ - "serde", - ] - -+[[package]] -+name = "pem-rfc7468" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -+dependencies = [ -+ "base64ct", -+] -+ - [[package]] - name = "percent-encoding" - version = "2.3.1" -@@ -5254,14 +5516,35 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -+[[package]] -+name = "pkcs1" -+version = "0.7.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -+dependencies = [ -+ "der 0.7.9", -+ "pkcs8 0.10.2", -+ "spki 0.7.3", -+] -+ - [[package]] - name = "pkcs8" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" - dependencies = [ -- "der", -- "spki", -+ "der 0.6.1", -+ "spki 0.6.0", -+] -+ -+[[package]] -+name = "pkcs8" -+version = "0.10.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -+dependencies = [ -+ "der 0.7.9", -+ "spki 0.7.3", - ] - - [[package]] -@@ -5304,6 +5587,12 @@ dependencies = [ - "windows-sys 0.59.0", - ] - -+[[package]] -+name = "portable-atomic" -+version = "1.11.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" -+ - [[package]] - name = "powerfmt" - version = "0.2.0" -@@ -5350,12 +5639,13 @@ dependencies = [ - - [[package]] - name = "priority-queue" --version = "1.4.0" -+version = "2.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785" -+checksum = "ef08705fa1589a1a59aa924ad77d14722cb0cd97b67dd5004ed5f4a4873fce8d" - dependencies = [ - "autocfg", -- "indexmap 1.9.3", -+ "equivalent", -+ "indexmap 2.7.1", - ] - - [[package]] -@@ -5474,27 +5764,53 @@ dependencies = [ - - [[package]] - name = "protobuf" --version = "2.28.0" -+version = "3.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94" -+checksum = "d65a1d4ddae7d8b5de68153b48f6aa3bba8cb002b243dbdbc55a5afbc98f99f4" -+dependencies = [ -+ "once_cell", -+ "protobuf-support", -+ "thiserror 1.0.69", -+] - - [[package]] - name = "protobuf-codegen" --version = "2.28.0" -+version = "3.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6" -+checksum = "5d3976825c0014bbd2f3b34f0001876604fe87e0c86cd8fa54251530f1544ace" - dependencies = [ -+ "anyhow", -+ "once_cell", - "protobuf", -+ "protobuf-parse", -+ "regex", -+ "tempfile", -+ "thiserror 1.0.69", - ] - - [[package]] --name = "protobuf-codegen-pure" --version = "2.28.0" -+name = "protobuf-parse" -+version = "3.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "95a29399fc94bcd3eeaa951c715f7bea69409b2445356b00519740bcd6ddd865" -+checksum = "b4aeaa1f2460f1d348eeaeed86aea999ce98c1bded6f089ff8514c9d9dbdc973" - dependencies = [ -+ "anyhow", -+ "indexmap 2.7.1", -+ "log", - "protobuf", -- "protobuf-codegen", -+ "protobuf-support", -+ "tempfile", -+ "thiserror 1.0.69", -+ "which", -+] -+ -+[[package]] -+name = "protobuf-support" -+version = "3.7.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3e36c2f31e0a47f9280fb347ef5e461ffcd2c52dd520d8e216b52f93b0b0d7d6" -+dependencies = [ -+ "thiserror 1.0.69", - ] - - [[package]] -@@ -5513,6 +5829,16 @@ dependencies = [ - "psl-types", - ] - -+[[package]] -+name = "quick-xml" -+version = "0.36.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" -+dependencies = [ -+ "memchr", -+ "serde", -+] -+ - [[package]] - name = "quick-xml" - version = "0.37.2" -@@ -5533,7 +5859,7 @@ dependencies = [ - "pin-project-lite", - "quinn-proto", - "quinn-udp", -- "rustc-hash", -+ "rustc-hash 2.1.1", - "rustls 0.23.23", - "socket2", - "thiserror 2.0.12", -@@ -5551,7 +5877,7 @@ dependencies = [ - "getrandom 0.2.15", - "rand 0.8.5", - "ring", -- "rustc-hash", -+ "rustc-hash 2.1.1", - "rustls 0.23.23", - "rustls-pki-types", - "slab", -@@ -5812,6 +6138,7 @@ dependencies = [ - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.32", -+ "hyper-rustls 0.24.2", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", -@@ -5821,6 +6148,7 @@ dependencies = [ - "once_cell", - "percent-encoding", - "pin-project-lite", -+ "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", -@@ -5829,11 +6157,13 @@ dependencies = [ - "system-configuration 0.5.1", - "tokio", - "tokio-native-tls", -+ "tokio-rustls 0.24.1", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -+ "webpki-roots", - "winreg", - ] - -@@ -5892,7 +6222,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" - dependencies = [ - "crypto-bigint 0.4.9", -- "hmac 0.12.1", -+ "hmac", - "zeroize", - ] - -@@ -5919,6 +6249,26 @@ dependencies = [ - "windows-sys 0.52.0", - ] - -+[[package]] -+name = "rsa" -+version = "0.9.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" -+dependencies = [ -+ "const-oid", -+ "digest", -+ "num-bigint-dig", -+ "num-integer", -+ "num-traits", -+ "pkcs1", -+ "pkcs8 0.10.2", -+ "rand_core 0.6.4", -+ "signature 2.2.0", -+ "spki 0.7.3", -+ "subtle", -+ "zeroize", -+] -+ - [[package]] - name = "rtcp-types" - version = "0.1.0" -@@ -5968,6 +6318,12 @@ version = "0.1.24" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -+[[package]] -+name = "rustc-hash" -+version = "1.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -+ - [[package]] - name = "rustc-hash" - version = "2.1.1" -@@ -6032,12 +6388,28 @@ dependencies = [ - "sct", - ] - -+[[package]] -+name = "rustls" -+version = "0.22.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -+dependencies = [ -+ "log", -+ "ring", -+ "rustls-pki-types", -+ "rustls-webpki 0.102.8", -+ "subtle", -+ "zeroize", -+] -+ - [[package]] - name = "rustls" - version = "0.23.23" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" - dependencies = [ -+ "aws-lc-rs", -+ "log", - "once_cell", - "ring", - "rustls-pki-types", -@@ -6055,7 +6427,32 @@ dependencies = [ - "openssl-probe", - "rustls-pemfile 1.0.4", - "schannel", -- "security-framework", -+ "security-framework 2.11.1", -+] -+ -+[[package]] -+name = "rustls-native-certs" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -+dependencies = [ -+ "openssl-probe", -+ "rustls-pemfile 2.2.0", -+ "rustls-pki-types", -+ "schannel", -+ "security-framework 2.11.1", -+] -+ -+[[package]] -+name = "rustls-native-certs" -+version = "0.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" -+dependencies = [ -+ "openssl-probe", -+ "rustls-pki-types", -+ "schannel", -+ "security-framework 3.2.0", - ] - - [[package]] -@@ -6101,6 +6498,7 @@ version = "0.102.8" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" - dependencies = [ -+ "aws-lc-rs", - "ring", - "rustls-pki-types", - "untrusted", -@@ -6190,9 +6588,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" - dependencies = [ - "base16ct", -- "der", -+ "der 0.6.1", - "generic-array", -- "pkcs8", -+ "pkcs8 0.9.0", - "subtle", - "zeroize", - ] -@@ -6204,7 +6602,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" - dependencies = [ - "bitflags 2.9.0", -- "core-foundation", -+ "core-foundation 0.9.4", -+ "core-foundation-sys", -+ "libc", -+ "security-framework-sys", -+] -+ -+[[package]] -+name = "security-framework" -+version = "3.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" -+dependencies = [ -+ "bitflags 2.9.0", -+ "core-foundation 0.10.0", - "core-foundation-sys", - "libc", - "security-framework-sys", -@@ -6353,19 +6764,6 @@ dependencies = [ - "syn 2.0.99", - ] - --[[package]] --name = "sha-1" --version = "0.9.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" --dependencies = [ -- "block-buffer 0.9.0", -- "cfg-if", -- "cpufeatures", -- "digest 0.9.0", -- "opaque-debug", --] -- - [[package]] - name = "sha1" - version = "0.10.6" -@@ -6374,7 +6772,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" - dependencies = [ - "cfg-if", - "cpufeatures", -- "digest 0.10.7", -+ "digest", - ] - - [[package]] -@@ -6385,7 +6783,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" - dependencies = [ - "cfg-if", - "cpufeatures", -- "digest 0.10.7", -+ "digest", - ] - - [[package]] -@@ -6443,7 +6841,17 @@ version = "1.6.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" - dependencies = [ -- "digest 0.10.7", -+ "digest", -+ "rand_core 0.6.4", -+] -+ -+[[package]] -+name = "signature" -+version = "2.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -+dependencies = [ -+ "digest", - "rand_core 0.6.4", - ] - -@@ -6514,6 +6922,15 @@ dependencies = [ - "lock_api", - ] - -+[[package]] -+name = "spinning_top" -+version = "0.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" -+dependencies = [ -+ "lock_api", -+] -+ - [[package]] - name = "spki" - version = "0.6.0" -@@ -6521,7 +6938,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" - dependencies = [ - "base64ct", -- "der", -+ "der 0.6.1", -+] -+ -+[[package]] -+name = "spki" -+version = "0.7.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -+dependencies = [ -+ "base64ct", -+ "der 0.7.9", - ] - - [[package]] -@@ -6569,6 +6996,90 @@ version = "2.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" - -+[[package]] -+name = "symphonia" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" -+dependencies = [ -+ "lazy_static", -+ "symphonia-bundle-mp3", -+ "symphonia-codec-vorbis", -+ "symphonia-core", -+ "symphonia-format-ogg", -+ "symphonia-metadata", -+] -+ -+[[package]] -+name = "symphonia-bundle-mp3" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c01c2aae70f0f1fb096b6f0ff112a930b1fb3626178fba3ae68b09dce71706d4" -+dependencies = [ -+ "lazy_static", -+ "log", -+ "symphonia-core", -+ "symphonia-metadata", -+] -+ -+[[package]] -+name = "symphonia-codec-vorbis" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a98765fb46a0a6732b007f7e2870c2129b6f78d87db7987e6533c8f164a9f30" -+dependencies = [ -+ "log", -+ "symphonia-core", -+ "symphonia-utils-xiph", -+] -+ -+[[package]] -+name = "symphonia-core" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" -+dependencies = [ -+ "arrayvec", -+ "bitflags 1.3.2", -+ "bytemuck", -+ "lazy_static", -+ "log", -+] -+ -+[[package]] -+name = "symphonia-format-ogg" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ada3505789516bcf00fc1157c67729eded428b455c27ca370e41f4d785bfa931" -+dependencies = [ -+ "log", -+ "symphonia-core", -+ "symphonia-metadata", -+ "symphonia-utils-xiph", -+] -+ -+[[package]] -+name = "symphonia-metadata" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" -+dependencies = [ -+ "encoding_rs", -+ "lazy_static", -+ "log", -+ "symphonia-core", -+] -+ -+[[package]] -+name = "symphonia-utils-xiph" -+version = "0.5.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "484472580fa49991afda5f6550ece662237b00c6f562c7d9638d1b086ed010fe" -+dependencies = [ -+ "symphonia-core", -+ "symphonia-metadata", -+] -+ - [[package]] - name = "syn" - version = "1.0.109" -@@ -6617,6 +7128,19 @@ dependencies = [ - "syn 2.0.99", - ] - -+[[package]] -+name = "sysinfo" -+version = "0.31.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be" -+dependencies = [ -+ "core-foundation-sys", -+ "libc", -+ "memchr", -+ "ntapi", -+ "windows", -+] -+ - [[package]] - name = "system-configuration" - version = "0.5.1" -@@ -6624,7 +7148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" - dependencies = [ - "bitflags 1.3.2", -- "core-foundation", -+ "core-foundation 0.9.4", - "system-configuration-sys 0.5.0", - ] - -@@ -6635,7 +7159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" - dependencies = [ - "bitflags 2.9.0", -- "core-foundation", -+ "core-foundation 0.9.4", - "system-configuration-sys 0.6.0", - ] - -@@ -6819,7 +7343,9 @@ checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" - dependencies = [ - "deranged", - "itoa", -+ "libc", - "num-conv", -+ "num_threads", - "powerfmt", - "serde", - "time-core", -@@ -6916,6 +7442,17 @@ dependencies = [ - "tokio", - ] - -+[[package]] -+name = "tokio-rustls" -+version = "0.25.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -+dependencies = [ -+ "rustls 0.22.4", -+ "rustls-pki-types", -+ "tokio", -+] -+ - [[package]] - name = "tokio-rustls" - version = "0.26.2" -@@ -6963,6 +7500,22 @@ dependencies = [ - "tungstenite 0.21.0", - ] - -+[[package]] -+name = "tokio-tungstenite" -+version = "0.24.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9" -+dependencies = [ -+ "futures-util", -+ "log", -+ "rustls 0.23.23", -+ "rustls-native-certs 0.8.1", -+ "rustls-pki-types", -+ "tokio", -+ "tokio-rustls 0.26.2", -+ "tungstenite 0.24.0", -+] -+ - [[package]] - name = "tokio-util" - version = "0.7.13" -@@ -7154,6 +7707,26 @@ dependencies = [ - "utf-8", - ] - -+[[package]] -+name = "tungstenite" -+version = "0.24.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a" -+dependencies = [ -+ "byteorder", -+ "bytes", -+ "data-encoding", -+ "http 1.2.0", -+ "httparse", -+ "log", -+ "rand 0.8.5", -+ "rustls 0.23.23", -+ "rustls-pki-types", -+ "sha1", -+ "thiserror 1.0.69", -+ "utf-8", -+] -+ - [[package]] - name = "tungstenite" - version = "0.26.2" -@@ -7218,6 +7791,7 @@ dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -+ "serde", - ] - - [[package]] -@@ -7266,6 +7840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587" - dependencies = [ - "getrandom 0.3.1", -+ "rand 0.9.0", - ] - - [[package]] -@@ -7299,13 +7874,40 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - - [[package]] - name = "vergen" --version = "3.2.0" -+version = "9.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e7141e445af09c8919f1d5f8a20dae0b20c3b57a45dee0d5823c6ed5d237f15a" -+checksum = "e0d2f179f8075b805a43a2a21728a46f0cc2921b3c58695b28fa8817e103cd9a" - dependencies = [ -- "bitflags 1.3.2", -- "chrono", -- "rustc_version", -+ "anyhow", -+ "derive_builder", -+ "rustversion", -+ "time", -+ "vergen-lib", -+] -+ -+[[package]] -+name = "vergen-gitcl" -+version = "1.0.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2f89d70a58a4506a6079cedf575c64cf51649ccbb4e02a63dac539b264b7711" -+dependencies = [ -+ "anyhow", -+ "derive_builder", -+ "rustversion", -+ "time", -+ "vergen", -+ "vergen-lib", -+] -+ -+[[package]] -+name = "vergen-lib" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9b07e6010c0f3e59fcb164e0163834597da68d1f864e2b8ca49f74de01e9c166" -+dependencies = [ -+ "anyhow", -+ "derive_builder", -+ "rustversion", - ] - - [[package]] -@@ -7495,12 +8097,40 @@ dependencies = [ - "ebml-iterable", - ] - -+[[package]] -+name = "webpki" -+version = "0.22.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -+dependencies = [ -+ "ring", -+ "untrusted", -+] -+ -+[[package]] -+name = "webpki-roots" -+version = "0.25.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" -+ - [[package]] - name = "weezl" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - -+[[package]] -+name = "which" -+version = "4.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" -+dependencies = [ -+ "either", -+ "home", -+ "once_cell", -+ "rustix", -+] -+ - [[package]] - name = "winapi" - version = "0.3.9" -@@ -7532,6 +8162,16 @@ version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -+[[package]] -+name = "windows" -+version = "0.57.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" -+dependencies = [ -+ "windows-core 0.57.0", -+ "windows-targets 0.52.6", -+] -+ - [[package]] - name = "windows-core" - version = "0.52.0" -@@ -7541,6 +8181,40 @@ dependencies = [ - "windows-targets 0.52.6", - ] - -+[[package]] -+name = "windows-core" -+version = "0.57.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" -+dependencies = [ -+ "windows-implement", -+ "windows-interface", -+ "windows-result 0.1.2", -+ "windows-targets 0.52.6", -+] -+ -+[[package]] -+name = "windows-implement" -+version = "0.57.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.99", -+] -+ -+[[package]] -+name = "windows-interface" -+version = "0.57.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn 2.0.99", -+] -+ - [[package]] - name = "windows-link" - version = "0.1.0" -@@ -7553,11 +8227,20 @@ version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" - dependencies = [ -- "windows-result", -+ "windows-result 0.2.0", - "windows-strings", - "windows-targets 0.52.6", - ] - -+[[package]] -+name = "windows-result" -+version = "0.1.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -+dependencies = [ -+ "windows-targets 0.52.6", -+] -+ - [[package]] - name = "windows-result" - version = "0.2.0" -@@ -7573,7 +8256,7 @@ version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" - dependencies = [ -- "windows-result", -+ "windows-result 0.2.0", - "windows-targets 0.52.6", - ] - -@@ -7836,16 +8519,6 @@ dependencies = [ - "synstructure", - ] - --[[package]] --name = "zerocopy" --version = "0.6.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" --dependencies = [ -- "byteorder", -- "zerocopy-derive 0.6.6", --] -- - [[package]] - name = "zerocopy" - version = "0.7.35" -@@ -7865,17 +8538,6 @@ dependencies = [ - "zerocopy-derive 0.8.21", - ] - --[[package]] --name = "zerocopy-derive" --version = "0.6.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" --dependencies = [ -- "proc-macro2", -- "quote", -- "syn 2.0.99", --] -- - [[package]] - name = "zerocopy-derive" - version = "0.7.35" -diff --git a/audio/spotify/Cargo.toml b/audio/spotify/Cargo.toml -index 387785cd..b063b8ca 100644 ---- a/audio/spotify/Cargo.toml -+++ b/audio/spotify/Cargo.toml -@@ -11,9 +11,9 @@ rust-version.workspace = true - [dependencies] - gst.workspace = true - gst-base.workspace = true --librespot-core = "0.4" --librespot-playback = "0.4" --tokio = { version = "1", features = ["rt-multi-thread"] } -+librespot-core = "0.5" -+librespot-playback = { version = "0.5", features = ['passthrough-decoder'] } -+tokio = { version = "1.0", features = ["rt-multi-thread"] } - futures = "0.3" - anyhow = "1.0" - url = "2.3" -diff --git a/audio/spotify/README.md b/audio/spotify/README.md -index 98237747..2e364926 100644 ---- a/audio/spotify/README.md -+++ b/audio/spotify/README.md -@@ -9,23 +9,36 @@ to respect their legal/licensing restrictions. - ## Spotify Credentials - - This plugin requires a [Spotify Premium](https://www.spotify.com/premium/) account. --If your account is linked with Facebook, you'll need to setup --a [device username and password](https://www.spotify.com/us/account/set-device-password/). - --Those username and password are then set using the `username` and `password` properties. -+Provide a Spotify access token with 'streaming' scope using the `access-token` property. Such a token can be obtained by completing -+[Spotify's OAuth flow](https://developer.spotify.com/documentation/web-api/concepts/authorization) or using the facility on their -+[Web SDK getting started guide](https://developer.spotify.com/documentation/web-playback-sdk/tutorials/getting-started). -+A token can also be obtained using [librespot-oauth](https://github.com/librespot-org/librespot/blob/dev/oauth/examples/oauth.rs): - --You may also want to cache credentials and downloaded files, see the `cache-` properties on the element. -+```console -+cargo install librespot-oauth --example oauth && oauth -+``` -+ -+Note, Spotify access tokens are only valid for 1 hour and must be [refreshed](https://developer.spotify.com/documentation/web-api/tutorials/refreshing-tokens) -+for usage beyond that. -+ -+It is therefore advisable to also use the `cache-credentials` property. On first usage, your access token is exchanged for a reusable credentials blob and -+stored at the location specified by this property. Once obtained, that credentials blob is used for login and any provided `access-token` is ignored. -+Unlike Spotify access tokens, the user's credentials blob does not expire. Avoiding handling token refresh greatly simplifies plugin usage. -+If you do not set `cache-credentials`, you must manage refreshing your Spotify access token so it's valid for login when the element starts. -+ -+You may also want to cache downloaded files, see the `cache-files` property. - - ## spotifyaudiosrc - - The `spotifyaudiosrc` element can be used to play a song from Spotify using its [Spotify URI](https://community.spotify.com/t5/FAQs/What-s-a-Spotify-URI/ta-p/919201). - - ``` --gst-launch-1.0 spotifyaudiosrc username=$USERNAME password=$PASSWORD track=spotify:track:3i3P1mGpV9eRlfKccjDjwi ! oggdemux ! vorbisdec ! audioconvert ! autoaudiosink -+gst-launch-1.0 spotifyaudiosrc access-token=$ACCESS_TOKEN track=spotify:track:3i3P1mGpV9eRlfKccjDjwi ! oggdemux ! vorbisdec ! audioconvert ! autoaudiosink - ``` - - The element also implements an URI handler which accepts credentials and cache settings as URI parameters: - - ```console --gst-launch-1.0 playbin3 uri=spotify:track:3i3P1mGpV9eRlfKccjDjwi?username=$USERNAME\&password=$PASSWORD\&cache-credentials=cache\&cache-files=cache -+gst-launch-1.0 playbin3 uri=spotify:track:3i3P1mGpV9eRlfKccjDjwi?access-token=$ACCESS_TOKEN\&cache-credentials=cache\&cache-files=cache - ``` -\ No newline at end of file -diff --git a/audio/spotify/src/common.rs b/audio/spotify/src/common.rs -index ed77dcc6..a5764ef8 100644 ---- a/audio/spotify/src/common.rs -+++ b/audio/spotify/src/common.rs -@@ -18,8 +18,7 @@ use librespot_core::{ - - #[derive(Default, Debug, Clone)] - pub struct Settings { -- username: String, -- password: String, -+ access_token: String, - cache_credentials: String, - cache_files: String, - cache_max_size: u64, -@@ -28,52 +27,46 @@ pub struct Settings { - - impl Settings { - pub fn properties() -> Vec { -- vec![glib::ParamSpecString::builder("username") -- .nick("Username") -- .blurb("Spotify username, Facebook accounts need a device username from https://www.spotify.com/us/account/set-device-password/") -- .default_value(Some("")) -- .mutable_ready() -- .build(), -- glib::ParamSpecString::builder("password") -- .nick("Password") -- .blurb("Spotify password, Facebook accounts need a device password from https://www.spotify.com/us/account/set-device-password/") -- .default_value(Some("")) -- .mutable_ready() -- .build(), -- glib::ParamSpecString::builder("cache-credentials") -- .nick("Credentials cache") -- .blurb("Directory where to cache Spotify credentials") -- .default_value(Some("")) -- .mutable_ready() -- .build(), -- glib::ParamSpecString::builder("cache-files") -- .nick("Files cache") -- .blurb("Directory where to cache downloaded files from Spotify") -- .default_value(Some("")) -- .mutable_ready() -- .build(), -- glib::ParamSpecUInt64::builder("cache-max-size") -- .nick("Cache max size") -- .blurb("The max allowed size of the cache, in bytes, or 0 to disable the cache limit") -- .default_value(0) -- .mutable_ready() -- .build(), -- glib::ParamSpecString::builder("track") -- .nick("Spotify URI") -- .blurb("Spotify track URI, in the form 'spotify:track:$SPOTIFY_ID'") -- .default_value(Some("")) -- .mutable_ready() -- .build(), -- ] -+ vec![ -+ glib::ParamSpecString::builder("access-token") -+ .nick("Access token") -+ .blurb("Spotify access token, requires 'streaming' scope") -+ .default_value(Some("")) -+ .mutable_ready() -+ .build(), -+ glib::ParamSpecString::builder("cache-credentials") -+ .nick("Credentials cache") -+ .blurb("Directory where to cache Spotify credentials") -+ .default_value(Some("")) -+ .mutable_ready() -+ .build(), -+ glib::ParamSpecString::builder("cache-files") -+ .nick("Files cache") -+ .blurb("Directory where to cache downloaded files from Spotify") -+ .default_value(Some("")) -+ .mutable_ready() -+ .build(), -+ glib::ParamSpecUInt64::builder("cache-max-size") -+ .nick("Cache max size") -+ .blurb( -+ "The max allowed size of the cache, in bytes, or 0 to disable the cache limit", -+ ) -+ .default_value(0) -+ .mutable_ready() -+ .build(), -+ glib::ParamSpecString::builder("track") -+ .nick("Spotify URI") -+ .blurb("Spotify track URI, in the form 'spotify:track:$SPOTIFY_ID'") -+ .default_value(Some("")) -+ .mutable_ready() -+ .build(), -+ ] - } - - pub fn set_property(&mut self, value: &glib::Value, pspec: &glib::ParamSpec) { - match pspec.name() { -- "username" => { -- self.username = value.get().expect("type checked upstream"); -- } -- "password" => { -- self.password = value.get().expect("type checked upstream"); -+ "access-token" => { -+ self.access_token = value.get().expect("type checked upstream"); - } - "cache-credentials" => { - self.cache_credentials = value.get().expect("type checked upstream"); -@@ -93,8 +86,7 @@ impl Settings { - - pub fn property(&self, pspec: &glib::ParamSpec) -> glib::Value { - match pspec.name() { -- "username" => self.username.to_value(), -- "password" => self.password.to_value(), -+ "access-token" => self.access_token.to_value(), - "cache-credentials" => self.cache_credentials.to_value(), - "cache-files" => self.cache_files.to_value(), - "cache-max-size" => self.cache_max_size.to_value(), -@@ -132,32 +124,20 @@ impl Settings { - let cache = Cache::new(credentials_cache, None, files_cache, max_size)?; - - if let Some(cached_cred) = cache.credentials() { -- if !self.username.is_empty() && self.username != cached_cred.username { -- gst::debug!( -- cat, -- obj = &src, -- "ignore cached credentials for user {} which mismatch user {}", -- cached_cred.username, -- self.username -- ); -- } else { -- gst::debug!( -- cat, -- obj = &src, -- "reuse cached credentials for user {}", -- cached_cred.username -- ); -- if let Ok((session, _credentials)) = Session::connect( -- SessionConfig::default(), -- cached_cred, -- Some(cache.clone()), -- true, -- ) -- .await -- { -- return Ok(session); -- } -- } -+ let cached_username = cached_cred -+ .username -+ .as_ref() -+ .map_or("UNKNOWN", |s| s.as_str()); -+ gst::debug!( -+ cat, -+ obj = &src, -+ "reuse cached credentials for user {}", -+ cached_username -+ ); -+ -+ let session = Session::new(SessionConfig::default(), Some(cache)); -+ session.connect(cached_cred, true).await?; -+ return Ok(session); - } - - gst::debug!( -@@ -166,17 +146,14 @@ impl Settings { - "credentials not in cache or cached credentials invalid", - ); - -- if self.username.is_empty() { -- bail!("username is not set and credentials are not in cache"); -- } -- if self.password.is_empty() { -- bail!("password is not set and credentials are not in cache"); -+ if self.access_token.is_empty() { -+ bail!("access-token is not set and credentials are not in cache"); - } - -- let cred = Credentials::with_password(&self.username, &self.password); -+ let cred = Credentials::with_access_token(&self.access_token); - -- let (session, _credentials) = -- Session::connect(SessionConfig::default(), cred, Some(cache), true).await?; -+ let session = Session::new(SessionConfig::default(), Some(cache)); -+ session.connect(cred, true).await?; - - Ok(session) - } -@@ -185,9 +162,7 @@ impl Settings { - if self.track.is_empty() { - bail!("track is not set"); - } -- let track = SpotifyId::from_uri(&self.track).map_err(|_| { -- anyhow::anyhow!("failed to create Spotify URI from track {}", self.track) -- })?; -+ let track = SpotifyId::from_uri(&self.track)?; - - Ok(track) - } -diff --git a/audio/spotify/src/spotifyaudiosrc/imp.rs b/audio/spotify/src/spotifyaudiosrc/imp.rs -index 6f429682..932f5a9f 100644 ---- a/audio/spotify/src/spotifyaudiosrc/imp.rs -+++ b/audio/spotify/src/spotifyaudiosrc/imp.rs -@@ -52,7 +52,7 @@ enum Message { - } - - struct State { -- player: Player, -+ player: Arc, - - /// receiver sending buffer to streaming thread - receiver: mpsc::Receiver, -@@ -321,11 +321,10 @@ struct BufferSink { - - impl Sink for BufferSink { - fn write(&mut self, packet: AudioPacket, _converter: &mut Converter) -> SinkResult<()> { -- let oggdata = match packet { -- AudioPacket::OggData(data) => data, -- AudioPacket::Samples(_) => unimplemented!(), -+ let buffer = match packet { -+ AudioPacket::Samples(_) => unreachable!(), -+ AudioPacket::Raw(ogg) => gst::Buffer::from_slice(ogg), - }; -- let buffer = gst::Buffer::from_slice(oggdata); - - // ignore if sending fails as that means the source element is being shutdown - let _ = self.sender.send(Message::Buffer(buffer)); -@@ -360,7 +359,7 @@ impl URIHandlerImpl for SpotifyAudioSrc { - // allow to configure auth and cache settings from the URI - for (key, value) in url.query_pairs() { - match key.as_ref() { -- "username" | "password" | "cache-credentials" | "cache-files" => { -+ "access-token" | "cache-credentials" | "cache-files" => { - self.obj().set_property(&key, value.as_ref()); - } - _ => { -@@ -435,10 +434,10 @@ impl SpotifyAudioSrc { - let (sender, receiver) = mpsc::sync_channel(2); - let sender_clone = sender.clone(); - -- let (mut player, mut player_event_channel) = -- Player::new(player_config, session, Box::new(NoOpVolume), || { -- Box::new(BufferSink { sender }) -- }); -+ let player = Player::new(player_config, session, Box::new(NoOpVolume), || { -+ Box::new(BufferSink { sender }) -+ }); -+ let mut player_event_channel = player.get_player_event_channel(); - - player.load(track, true, 0); - -diff --git a/docs/plugins/gst_plugins_cache.json b/docs/plugins/gst_plugins_cache.json -index 4e2a1361..73aba5b9 100644 ---- a/docs/plugins/gst_plugins_cache.json -+++ b/docs/plugins/gst_plugins_cache.json -@@ -11472,6 +11472,18 @@ - } - }, - "properties": { -+ "access-token": { -+ "blurb": "Spotify access token, requires 'streaming' scope", -+ "conditionally-available": false, -+ "construct": false, -+ "construct-only": false, -+ "controllable": false, -+ "default": "", -+ "mutable": "ready", -+ "readable": true, -+ "type": "gchararray", -+ "writable": true -+ }, - "bitrate": { - "blurb": "Spotify audio bitrate in kbit/s", - "conditionally-available": false, --- -2.48.1 - diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index aff3768552fb..f8390aed9c40 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -265,12 +265,6 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests = { - # Applies patches. - # TODO: remove with 0.14 - inherit mopidy; - }; - updateScript = nix-update-script { # use numbered releases rather than gstreamer-* releases # this matches upstream's recommendation: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/470#note_2202772 From 36b4528952059d7df1a1ee1663cd8ce3b1e820f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 16 Aug 2025 20:12:57 +0000 Subject: [PATCH 45/61] linuxPackages.xone: 0.4.1 -> 0.4.3 --- pkgs/os-specific/linux/xone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index eaab145f9845..cb89449424c7 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xone"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "dlundqvist"; repo = "xone"; tag = "v${finalAttrs.version}"; - hash = "sha256-myiKYXJ4Qisz6uJYO75xs/lGj7A/Ft+6frky9lBuWzc="; + hash = "sha256-ab/OlVezruvccKzcM4Ews6ydAJ8r64XfkPlFYpUycLQ="; }; setSourceRoot = '' From 2c25cb0891d23f052baac7db22004ec39e683921 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 22 Aug 2025 18:11:21 +0200 Subject: [PATCH 46/61] workflows/{merge-group,pr}: post "no PR failures" status manually Posting the status manually allows us to avoid the strange "skipped == success" logic and properly skip the `unlock` job for pull_request events in the next commit. This should be much easier to understand than the previous logic. --- .github/workflows/merge-group.yml | 30 ++++++++++++++++++--------- .github/workflows/pr.yml | 34 ++++++++++++++++++------------- .github/workflows/test.yml | 7 +++++-- 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml index dac02065debf..e7404d5a6975 100644 --- a/.github/workflows/merge-group.yml +++ b/.github/workflows/merge-group.yml @@ -26,19 +26,29 @@ jobs: mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }} targetSha: ${{ inputs.targetSha || github.event.merge_group.base_sha }} - # This job's only purpose is to serve as a target for the "Required Status Checks" branch ruleset. + # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset. # It "needs" all the jobs that should block the Merge Queue. - # If they pass, it is skipped — which counts as "success" for purposes of the branch ruleset. - # However, if any of them fail, this job will also fail — thus blocking the branch ruleset. - no-pr-failures: + unlock: # Modify this list to add or remove jobs from required status checks. needs: - lint - # WARNING: - # Do NOT change the name of this job, otherwise the rule will not catch it anymore. - # This would prevent all PRs from passing the merge queue. - name: no PR failures - if: ${{ failure() }} runs-on: ubuntu-24.04-arm + permissions: + statuses: write steps: - - run: exit 1 + - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + with: + script: | + const { serverUrl, repo, runId, payload } = context + const target_url = + `${serverUrl}/${repo.owner}/${repo.repo}/actions/runs/${runId}` + await github.rest.repos.createCommitStatus({ + ...repo, + sha: payload.merge_group.head_sha, + // WARNING: + // Do NOT change the name of this, otherwise the rule will not catch it anymore. + // This would prevent all PRs from merging. + context: 'no PR failures', + state: 'success', + target_url, + }) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a7720df7226a..b280e7c4dd35 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -119,26 +119,32 @@ jobs: baseBranch: ${{ needs.prepare.outputs.baseBranch }} mergedSha: ${{ needs.prepare.outputs.mergedSha }} - # This job's only purpose is to serve as a target for the "Required Status Checks" branch ruleset. + # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset. # It "needs" all the jobs that should block merging a PR. - # If they pass, it is skipped — which counts as "success" for purposes of the branch ruleset. - # However, if any of them fail, this job will also fail — thus blocking the branch ruleset. - no-pr-failures: + unlock: # Modify this list to add or remove jobs from required status checks. needs: - check - lint - eval - build - # WARNING: - # Do NOT change the name of this job, otherwise the rule will not catch it anymore. - # This would prevent all PRs from merging. - name: no PR failures - # A single job is "cancelled" when it hits its timeout. This is not the same - # as "skipped", which happens when the `if` condition doesn't apply. - # The "cancelled()" function only checks the whole workflow, but not individual - # jobs. - if: ${{ failure() || contains(needs.*.result, 'cancelled') }} runs-on: ubuntu-24.04-arm + permissions: + statuses: write steps: - - run: exit 1 + - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 + with: + script: | + const { serverUrl, repo, runId, payload } = context + const target_url = + `${serverUrl}/${repo.owner}/${repo.repo}/actions/runs/${runId}?pr=${payload.pull_request.number}` + await github.rest.repos.createCommitStatus({ + ...repo, + sha: payload.pull_request.head.sha, + // WARNING: + // Do NOT change the name of this, otherwise the rule will not catch it anymore. + // This would prevent all PRs from merging. + context: 'no PR failures', + state: 'success', + target_url, + }) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f26c371a5563..b3c2c6c59863 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -76,6 +76,9 @@ jobs: name: Merge Group needs: [prepare] uses: ./.github/workflows/merge-group.yml + # Those are actually only used on the merge_group event, but will throw an error if not set. + permissions: + statuses: write secrets: CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }} with: @@ -87,7 +90,7 @@ jobs: name: PR needs: [prepare] uses: ./.github/workflows/pr.yml - # Those are not actually used on pull_request, but will throw an error if not set. + # Those are actually only used on the pull_request_target event, but will throw an error if not set. permissions: issues: write pull-requests: write @@ -102,7 +105,7 @@ jobs: name: Push needs: [prepare] uses: ./.github/workflows/push.yml - # Those are not actually used on push, but will throw an error if not set. + # Those are not actually used on the push or pull_request events, but will throw an error if not set. permissions: statuses: write secrets: From 5ff32763b23369e3e1c06d3728e71a7bace4e0e3 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 22 Aug 2025 18:14:07 +0200 Subject: [PATCH 47/61] workflows/{merge-group,pr}: avoid posting "no PR failures" for pull_request trigger The required status checks should depend on exactly one workflow, triggered via pull_request_target or merge_group. Anything that is triggered by pull_request is for testing purposes of the workflows themselves only. --- .github/workflows/merge-group.yml | 1 + .github/workflows/pr.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml index e7404d5a6975..9af5cf0ebb71 100644 --- a/.github/workflows/merge-group.yml +++ b/.github/workflows/merge-group.yml @@ -29,6 +29,7 @@ jobs: # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset. # It "needs" all the jobs that should block the Merge Queue. unlock: + if: github.event_name != 'pull_request' # Modify this list to add or remove jobs from required status checks. needs: - lint diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b280e7c4dd35..936a9173e7c4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -122,6 +122,7 @@ jobs: # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset. # It "needs" all the jobs that should block merging a PR. unlock: + if: github.event_name != 'pull_request' # Modify this list to add or remove jobs from required status checks. needs: - check From 956d0a744d2fa17a392bb04b2a25d10aef642813 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 22 Aug 2025 18:44:19 +0200 Subject: [PATCH 48/61] workflows/check: allow owners to fail when ci/OWNERS is untouched The owners check is not reproducible, because it depends on the state of the NixOS org on GitHub. Owners can rename their accounts or they can leave the organisation and access to Nixpkgs can be removed from teams. All of this breaks the owners check for reasons unrelated to the PR at hand. This PR makes the check for the owners file conditionally required: Only when the ci/OWNERS file is actually modified a failed check will block merging the PR. When that's not the case, the check will still fail visibily in the checklist, but the failure can be ignored. This is especially relevant for the Merge Queue, which should not be entirely blocked whenever any of these events happen. Also, it allows passing the checks in a fork when testing, where the owners check will *always* fail, because the respective teams and members are never part of the "user org" that a fork is. --- .github/workflows/check.yml | 4 ++++ .github/workflows/pr.yml | 1 + ci/github-script/prepare.js | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ded8bad536c4..9192264266a1 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -12,6 +12,9 @@ on: mergedSha: required: true type: string + ownersCanFail: + required: true + type: boolean targetSha: required: true type: string @@ -94,6 +97,7 @@ jobs: # handling untrusted PR input. owners: runs-on: ubuntu-24.04-arm + continue-on-error: ${{ inputs.ownersCanFail }} timeout-minutes: 5 steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 936a9173e7c4..81f0f1d0f507 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -61,6 +61,7 @@ jobs: headBranch: ${{ needs.prepare.outputs.headBranch }} mergedSha: ${{ needs.prepare.outputs.mergedSha }} targetSha: ${{ needs.prepare.outputs.targetSha }} + ownersCanFail: ${{ !contains(fromJSON(needs.prepare.outputs.touched), 'owners') }} lint: name: Lint diff --git a/ci/github-script/prepare.js b/ci/github-script/prepare.js index fb000cb6820a..0fcec880f376 100644 --- a/ci/github-script/prepare.js +++ b/ci/github-script/prepare.js @@ -76,8 +76,10 @@ module.exports = async ({ github, context, core }) => { }) ).map((file) => file.filename) - if (files.includes('ci/pinned.json')) core.setOutput('touched', ['pinned']) - else core.setOutput('touched', []) + const touched = [] + if (files.includes('ci/pinned.json')) touched.push('pinned') + if (files.includes('ci/OWNERS')) touched.push('owners') + core.setOutput('touched', touched) return } From 8416afc141769df88bc3de92a875e333c4cdd030 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Aug 2025 18:23:59 +0000 Subject: [PATCH 49/61] snx-rs: 4.5.0 -> 4.6.0 --- pkgs/by-name/sn/snx-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index f4da1773fcc4..aa7086957869 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -14,13 +14,13 @@ }: rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${version}"; - hash = "sha256-24zklkFczsp7fhvka3T3Nz3bL61Owyrs8eHt7F9CQM8="; + hash = "sha256-KfN4lyBngatjk1e3DYabz+sruX/NjELg0psktMb8Pew="; }; passthru.updateScript = nix-update-script { }; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - cargoHash = "sha256-uDQzUl1q6mlDzs5D3b1/Q53Sz//BFeJZrE88HfMrXIk="; + cargoHash = "sha256-QMfQqy9VV3GF4ZWmzeWe+xGHYcvAxJUFg3QSCEMgS9E="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; From 42b6d626997c4ebe420da7ccd70352cc08681238 Mon Sep 17 00:00:00 2001 From: ibizaman Date: Wed, 16 Jul 2025 03:04:44 +0200 Subject: [PATCH 50/61] lldap: add options to set important secrets --- nixos/modules/services/databases/lldap.nix | 71 +++++++++++++++++++++ nixos/tests/lldap.nix | 72 +++++++++++++++++++--- 2 files changed, 134 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/databases/lldap.nix b/nixos/modules/services/databases/lldap.nix index a9fbe8f7e11a..1607754d7d9c 100644 --- a/nixos/modules/services/databases/lldap.nix +++ b/nixos/modules/services/databases/lldap.nix @@ -102,12 +102,83 @@ in default = "sqlite://./users.db?mode=rwc"; example = "postgres://postgres-user:password@postgres-server/my-database"; }; + + ldap_user_pass_file = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to a file containing the default admin password. + + If you want to update the default admin password through this setting, + you must set `force_ldap_user_pass_reset` to `true`. + Otherwise changing this setting will have no effect + unless this is the very first time LLDAP is started and its database is still empty. + ''; + }; + + force_ldap_user_pass_reset = mkOption { + type = types.oneOf [ + types.bool + (types.enum [ "always" ]) + ]; + default = false; + description = '' + Force reset of the admin password. + + Set this setting to `"always"` to update the admin password when `ldap_user_pass_file` changes. + Setting to `"always"` also means any password update in the UI will be overwritten next time the service restarts. + + The difference between `true` and `"always"` is the former is intended for a one time fix + while the latter is intended for a declarative workflow. In practice, the result + is the same: the password gets reset. The only practical difference is the former + outputs a warning message while the latter outputs an info message. + ''; + }; + + jwt_secret_file = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to a file containing the JWT secret. + ''; + }; }; }; + + # TOML does not allow null values, so we use null to omit those fields + apply = lib.filterAttrsRecursive (_: v: v != null); + }; + + silenceForceUserPassResetWarning = mkOption { + type = types.bool; + default = false; + description = '' + Disable warning when the admin password is set declaratively with the `ldap_user_pass_file` setting + but the `force_ldap_user_pass_reset` is set to `false`. + + This can lead to the admin password to drift from the one given declaratively. + If that is okay for you and you want to silence the warning, set this option to `true`. + ''; }; }; config = lib.mkIf cfg.enable { + warnings = + lib.optionals + ( + (cfg.settings.ldap_user_pass_file or null) != null + && cfg.settings.force_ldap_user_pass_reset == false + && cfg.silenceForceUserPassResetWarning == false + ) + [ + '' + lldap: The default admin password is declared with the setting `ldap_user_pass_file`, but `force_ldap_user_pass_reset` is set to `false`. + This means the admin password can be changed through the UI and will drift from the one defined in your nix config. + It also means changing the setting `ldap_user_pass_file` will have no effect on the admin password. + Either set `force_ldap_user_pass_reset` to `"always"` or silence this warning by setting the option `services.lldap.silenceForceUserPassResetWarning` to `true`. + '' + ]; + systemd.services.lldap = { description = "Lightweight LDAP server (lldap)"; wants = [ "network-online.target" ]; diff --git a/nixos/tests/lldap.nix b/nixos/tests/lldap.nix index c2e48525a5f3..aea6b2058727 100644 --- a/nixos/tests/lldap.nix +++ b/nixos/tests/lldap.nix @@ -1,4 +1,7 @@ { ... }: +let + adminPassword = "mySecretPassword"; +in { name = "lldap"; @@ -7,23 +10,74 @@ { services.lldap = { enable = true; + settings = { verbose = true; ldap_base_dn = "dc=example,dc=com"; }; }; environment.systemPackages = [ pkgs.openldap ]; + + specialisation = { + differentAdminPassword.configuration = + { ... }: + { + services.lldap.settings = { + ldap_user_pass_file = toString (pkgs.writeText "adminPasswordFile" adminPassword); + force_ldap_user_pass_reset = "always"; + }; + }; + + changeAdminPassword.configuration = + { ... }: + { + services.lldap.settings = { + ldap_user_pass_file = toString (pkgs.writeText "adminPasswordFile" "password"); + force_ldap_user_pass_reset = false; + }; + }; + }; }; - testScript = '' - machine.wait_for_unit("lldap.service") - machine.wait_for_open_port(3890) - machine.wait_for_open_port(17170) + testScript = + { nodes, ... }: + let + specializations = "${nodes.machine.system.build.toplevel}/specialisation"; + in + '' + machine.wait_for_unit("lldap.service") + machine.wait_for_open_port(3890) + machine.wait_for_open_port(17170) - machine.succeed("curl --location --fail http://localhost:17170/") + machine.succeed("curl --location --fail http://localhost:17170/") - print( - machine.succeed('ldapsearch -H ldap://localhost:3890 -D uid=admin,ou=people,dc=example,dc=com -b "ou=people,dc=example,dc=com" -w password') - ) - ''; + adminPassword="${adminPassword}" + + def try_login(user, password, expect_success=True): + cmd = f'ldapsearch -H ldap://localhost:3890 -D uid={user},ou=people,dc=example,dc=com -b "ou=people,dc=example,dc=com" -w {password}' + code, response = machine.execute(cmd) + print(cmd) + print(response) + if expect_success: + if code != 0: + raise Exception(f"Expected success, had failure {code}") + else: + if code == 0: + raise Exception("Expected failure, had success") + return response + + with subtest("default admin password"): + try_login("admin", "password", expect_success=True) + try_login("admin", adminPassword, expect_success=False) + + with subtest("different admin password"): + machine.succeed('${specializations}/differentAdminPassword/bin/switch-to-configuration test') + try_login("admin", "password", expect_success=False) + try_login("admin", adminPassword, expect_success=True) + + with subtest("change admin password has no effect"): + machine.succeed('${specializations}/differentAdminPassword/bin/switch-to-configuration test') + try_login("admin", "password", expect_success=False) + try_login("admin", adminPassword, expect_success=True) + ''; } From 078b5bba8345d56692d19a03a9f993933ee2a991 Mon Sep 17 00:00:00 2001 From: ibizaman Date: Tue, 15 Jul 2025 18:42:42 +0200 Subject: [PATCH 51/61] lldap: lldap 0.6.1 -> 0.6.2 --- nixos/modules/services/databases/lldap.nix | 54 +++++++++++----- nixos/tests/lldap.nix | 8 ++- .../0001-parameterize-frontend-location.patch | 64 ------------------- pkgs/by-name/ll/lldap/package.nix | 30 +++++---- 4 files changed, 61 insertions(+), 95 deletions(-) delete mode 100644 pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch diff --git a/nixos/modules/services/databases/lldap.nix b/nixos/modules/services/databases/lldap.nix index 1607754d7d9c..3738dba506a7 100644 --- a/nixos/modules/services/databases/lldap.nix +++ b/nixos/modules/services/databases/lldap.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - utils, ... }: @@ -103,6 +102,16 @@ in example = "postgres://postgres-user:password@postgres-server/my-database"; }; + ldap_user_pass = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Password for default admin password. + + Unsecure: Use `ldap_user_pass_file` settings instead. + ''; + }; + ldap_user_pass_file = mkOption { type = types.nullOr types.str; default = null; @@ -163,21 +172,36 @@ in }; config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = + (cfg.settings.ldap_user_pass_file or null) != null || (cfg.settings.ldap_user_pass or null) != null; + message = "lldap: Default admin user password must be set. Please set the `ldap_user_pass` or better the `ldap_user_pass_file` setting."; + } + { + assertion = + (cfg.settings.ldap_user_pass_file or null) == null || (cfg.settings.ldap_user_pass or null) == null; + message = "lldap: Both `ldap_user_pass` and `ldap_user_pass_file` settings should not be set at the same time. Set one to `null`."; + } + ]; + warnings = - lib.optionals - ( - (cfg.settings.ldap_user_pass_file or null) != null - && cfg.settings.force_ldap_user_pass_reset == false - && cfg.silenceForceUserPassResetWarning == false - ) - [ - '' - lldap: The default admin password is declared with the setting `ldap_user_pass_file`, but `force_ldap_user_pass_reset` is set to `false`. - This means the admin password can be changed through the UI and will drift from the one defined in your nix config. - It also means changing the setting `ldap_user_pass_file` will have no effect on the admin password. - Either set `force_ldap_user_pass_reset` to `"always"` or silence this warning by setting the option `services.lldap.silenceForceUserPassResetWarning` to `true`. - '' - ]; + lib.optionals (cfg.settings.ldap_user_pass or null != null) [ + '' + lldap: Unsecure `ldap_user_pass` setting is used. Prefer `ldap_user_pass_file` instead. + '' + ] + ++ + lib.optionals + (cfg.settings.force_ldap_user_pass_reset == false && cfg.silenceForceUserPassResetWarning == false) + [ + '' + lldap: The `force_ldap_user_pass_reset` setting is set to `false` which means + the admin password can be changed through the UI and will drift from the one defined in your nix config. + It also means changing the setting `ldap_user_pass` or `ldap_user_pass_file` will have no effect on the admin password. + Either set `force_ldap_user_pass_reset` to `"always"` or silence this warning by setting the option `services.lldap.silenceForceUserPassResetWarning` to `true`. + '' + ]; systemd.services.lldap = { description = "Lightweight LDAP server (lldap)"; diff --git a/nixos/tests/lldap.nix b/nixos/tests/lldap.nix index aea6b2058727..8e38d4bdefa3 100644 --- a/nixos/tests/lldap.nix +++ b/nixos/tests/lldap.nix @@ -6,7 +6,7 @@ in name = "lldap"; nodes.machine = - { pkgs, ... }: + { pkgs, lib, ... }: { services.lldap = { enable = true; @@ -14,6 +14,8 @@ in settings = { verbose = true; ldap_base_dn = "dc=example,dc=com"; + + ldap_user_pass = "password"; }; }; environment.systemPackages = [ pkgs.openldap ]; @@ -23,7 +25,8 @@ in { ... }: { services.lldap.settings = { - ldap_user_pass_file = toString (pkgs.writeText "adminPasswordFile" adminPassword); + ldap_user_pass = lib.mkForce null; + ldap_user_pass_file = lib.mkForce (toString (pkgs.writeText "adminPasswordFile" adminPassword)); force_ldap_user_pass_reset = "always"; }; }; @@ -32,6 +35,7 @@ in { ... }: { services.lldap.settings = { + ldap_user_pass = lib.mkForce null; ldap_user_pass_file = toString (pkgs.writeText "adminPasswordFile" "password"); force_ldap_user_pass_reset = false; }; diff --git a/pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch b/pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch deleted file mode 100644 index c33f5a7afa10..000000000000 --- a/pkgs/by-name/ll/lldap/0001-parameterize-frontend-location.patch +++ /dev/null @@ -1,64 +0,0 @@ -From a09babb0cd9dd532ad2de920a2a35aa03d740dc6 Mon Sep 17 00:00:00 2001 -From: Herwig Hochleitner -Date: Thu, 8 Aug 2024 00:29:14 +0200 -Subject: [PATCH] parameterize frontend location - ---- - server/src/infra/tcp_server.rs | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/server/src/infra/tcp_server.rs b/server/src/infra/tcp_server.rs -index fa5f11f..16e64c5 100644 ---- a/server/src/infra/tcp_server.rs -+++ b/server/src/infra/tcp_server.rs -@@ -25,7 +25,7 @@ use std::sync::RwLock; - use tracing::info; - - async fn index(data: web::Data>) -> actix_web::Result { -- let mut file = std::fs::read_to_string(r"./app/index.html")?; -+ let mut file = std::fs::read_to_string(r"@frontend@/index.html")?; - - if data.server_url.path() != "/" { - file = file.replace( -@@ -80,7 +80,7 @@ pub(crate) fn error_to_http_response(error: TcpError) -> HttpResponse { - async fn main_js_handler( - data: web::Data>, - ) -> actix_web::Result { -- let mut file = std::fs::read_to_string(r"./app/static/main.js")?; -+ let mut file = std::fs::read_to_string(r"@frontend@/static/main.js")?; - - if data.server_url.path() != "/" { - file = file.replace("/pkg/", format!("{}/pkg/", data.server_url.path()).as_str()); -@@ -92,12 +92,12 @@ async fn main_js_handler( - } - - async fn wasm_handler() -> actix_web::Result { -- Ok(actix_files::NamedFile::open_async("./app/pkg/lldap_app_bg.wasm").await?) -+ Ok(actix_files::NamedFile::open_async("@frontend@/pkg/lldap_app_bg.wasm").await?) - } - - async fn wasm_handler_compressed() -> actix_web::Result { - Ok( -- actix_files::NamedFile::open_async("./app/pkg/lldap_app_bg.wasm.gz") -+ actix_files::NamedFile::open_async("@frontend@/pkg/lldap_app_bg.wasm.gz") - .await? - .customize() - .insert_header(header::ContentEncoding::Gzip) -@@ -143,11 +143,11 @@ fn http_config( - .service(web::resource("/pkg/lldap_app_bg.wasm").route(web::route().to(wasm_handler))) - .service(web::resource("/static/main.js").route(web::route().to(main_js_handler::))) - // Serve the /pkg path with the compiled WASM app. -- .service(Files::new("/pkg", "./app/pkg")) -+ .service(Files::new("/pkg", "@frontend@/pkg")) - // Serve static files -- .service(Files::new("/static", "./app/static")) -+ .service(Files::new("/static", "@frontend@/static")) - // Serve static fonts -- .service(Files::new("/static/fonts", "./app/static/fonts")) -+ .service(Files::new("/static/fonts", "@frontend@/static/fonts")) - // Default to serve index.html for unknown routes, to support routing. - .default_service(web::route().guard(guard::Get()).to(index::)); - } --- -2.45.2 - diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix index c335ffa727bf..becae0dea4a3 100644 --- a/pkgs/by-name/ll/lldap/package.nix +++ b/pkgs/by-name/ll/lldap/package.nix @@ -3,29 +3,30 @@ fetchFromGitHub, lib, lldap, + makeWrapper, nixosTests, rustPlatform, rustc, - wasm-bindgen-cli_0_2_95, + wasm-bindgen-cli_0_2_100, wasm-pack, which, }: let + version = "0.6.2"; - commonDerivationAttrs = rec { + commonDerivationAttrs = { pname = "lldap"; - version = "0.6.1"; + inherit version; src = fetchFromGitHub { owner = "lldap"; repo = "lldap"; rev = "v${version}"; - hash = "sha256-iQ+Vv9kx/pWHoa/WZChBK+FD2r1avzWWz57bnnzRjUg="; + hash = "sha256-UBQWOrHika8X24tYdFfY8ETPh9zvI7/HV5j4aK8Uq+Y="; }; - cargoHash = "sha256-qXYgr9uRswuo9hwVROUX9KUKpkzR0VEcXImbdyOgxsY="; - + cargoHash = "sha256-SO7+HiiXNB/KF3fjzSMeiTPjRQq/unEfsnplx4kZv9c="; }; frontend = rustPlatform.buildRustPackage ( @@ -35,7 +36,7 @@ let nativeBuildInputs = [ wasm-pack - wasm-bindgen-cli_0_2_95 + wasm-bindgen-cli_0_2_100 binaryen which rustc @@ -68,12 +69,10 @@ rustPlatform.buildRustPackage ( "lldap_set_password" ]; - patches = [ - ./0001-parameterize-frontend-location.patch - ]; - - postPatch = '' - substituteInPlace server/src/infra/tcp_server.rs --subst-var-by frontend '${frontend}' + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/lldap \ + --set LLDAP_ASSETS_PATH ${frontend} ''; passthru = { @@ -89,7 +88,10 @@ rustPlatform.buildRustPackage ( changelog = "https://github.com/lldap/lldap/blob/v${lldap.version}/CHANGELOG.md"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ bendlas ]; + maintainers = with maintainers; [ + bendlas + ibizaman + ]; mainProgram = "lldap"; }; } From ec44a39a389cb2cb4f515060c307abdf29b9c4b0 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 1 Jun 2025 19:06:26 -0400 Subject: [PATCH 52/61] nixos/qemu-vm: Allow configuration of empty disk image qemu devices. --- nixos/modules/virtualisation/qemu-vm.nix | 56 +++++++++++++++++------- 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 0832ca937d32..0cc1b1146a84 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -20,25 +20,17 @@ let cfg = config.virtualisation; - opt = options.virtualisation; - qemu = cfg.qemu.package; hostPkgs = cfg.host.pkgs; consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles; - driveOpts = + driveOptions = { ... }: { options = { - - file = mkOption { - type = types.str; - description = "The file image used for this drive."; - }; - driveExtraOpts = mkOption { type = types.attrsOf types.str; default = { }; @@ -299,7 +291,9 @@ let ${lib.pipe cfg.emptyDiskImages [ (lib.imap0 ( - idx: size: '' + idx: + { size, ... }: + '' test -e "empty${builtins.toString idx}.qcow2" || ${qemu}/bin/qemu-img create -f qcow2 "empty${builtins.toString idx}.qcow2" "${builtins.toString size}M" '' )) @@ -477,7 +471,20 @@ in }; virtualisation.emptyDiskImages = mkOption { - type = types.listOf types.ints.positive; + type = types.listOf ( + types.coercedTo types.ints.positive (size: { inherit size; }) ( + types.submodule { + options.size = mkOption { + type = types.ints.positive; + description = "The size of the disk in MiB"; + }; + options.driveConfig = mkOption { + type = lib.types.submodule driveOptions; + description = "Drive configuration to pass to {option}`virtualisation.qemu.drives`"; + }; + } + ) + ); default = [ ]; description = '' Additional disk images to provide to the VM. The value is @@ -829,7 +836,18 @@ in }; drives = mkOption { - type = types.listOf (types.submodule driveOpts); + type = types.listOf ( + types.submodule { + imports = [ driveOptions ]; + + options = { + file = mkOption { + type = types.str; + description = "The file image used for this drive."; + }; + }; + } + ); description = "Drives passed to qemu."; }; @@ -1310,10 +1328,16 @@ in driveExtraOpts.format = "raw"; } ]) - (imap0 (idx: _: { - file = "$(pwd)/empty${toString idx}.qcow2"; - driveExtraOpts.werror = "report"; - }) cfg.emptyDiskImages) + (imap0 ( + idx: imgCfg: + lib.mkMerge [ + { + file = "$(pwd)/empty${toString idx}.qcow2"; + driveExtraOpts.werror = "report"; + } + imgCfg.driveConfig + ] + ) cfg.emptyDiskImages) ]; # By default, use mkVMOverride to enable building test VMs (e.g. via From 35bbf24122dd03522dc281fef72309f206429c48 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 16 Aug 2025 14:12:31 -0400 Subject: [PATCH 53/61] nixos/tests/bees: Use autoFormat --- nixos/tests/bees.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/nixos/tests/bees.nix b/nixos/tests/bees.nix index b9e38b385d3c..e13e169bff14 100644 --- a/nixos/tests/bees.nix +++ b/nixos/tests/bees.nix @@ -5,29 +5,33 @@ nodes.machine = { config, pkgs, ... }: { - boot.initrd.postDeviceCommands = '' - ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux1 /dev/vdb - ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux2 /dev/vdc - ''; virtualisation.emptyDiskImages = [ - 4096 - 4096 + { + size = 4096; + driveConfig.deviceExtraOpts.serial = "aux1"; + } + { + size = 4096; + driveConfig.deviceExtraOpts.serial = "aux2"; + } ]; virtualisation.fileSystems = { "/aux1" = { # filesystem configured to be deduplicated - device = "/dev/disk/by-label/aux1"; + device = "/dev/disk/by-id/virtio-aux1"; fsType = "btrfs"; + autoFormat = true; }; "/aux2" = { # filesystem not configured to be deduplicated - device = "/dev/disk/by-label/aux2"; + device = "/dev/disk/by-id/virtio-aux2"; fsType = "btrfs"; + autoFormat = true; }; }; services.beesd.filesystems = { aux1 = { - spec = "LABEL=aux1"; + spec = "/dev/disk/by-id/virtio-aux1"; hashTableSizeMB = 16; verbosity = "debug"; }; From d22eef5cfa0cd941529ce3ad4d9b5d91ea791043 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 16 Aug 2025 14:12:31 -0400 Subject: [PATCH 54/61] nixos/tests/glusterfs: Use autoFormat --- nixos/tests/glusterfs.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix index e8b0a442aedc..9224797704e2 100644 --- a/nixos/tests/glusterfs.nix +++ b/nixos/tests/glusterfs.nix @@ -19,17 +19,18 @@ let networking.firewall.enable = false; services.glusterfs.enable = true; - # create a mount point for the volume - boot.initrd.postDeviceCommands = '' - ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb - ''; - - virtualisation.emptyDiskImages = [ 1024 ]; + virtualisation.emptyDiskImages = [ + { + size = 1024; + driveConfig.deviceExtraOpts.serial = "data"; + } + ]; virtualisation.fileSystems = { "/data" = { - device = "/dev/disk/by-label/data"; + device = "/dev/disk/by-id/virtio-data"; fsType = "ext4"; + autoFormat = true; }; }; }; From dc4a8f961ae3c9de85284d8d9a6850280d64f998 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 16 Aug 2025 14:12:31 -0400 Subject: [PATCH 55/61] nixos/tests/hardened: Use autoFormat --- nixos/tests/hardened.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index 5a11b0a90567..f025e85e3821 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -24,14 +24,17 @@ imports = [ ../modules/profiles/hardened.nix ]; environment.memoryAllocator.provider = "graphene-hardened"; nix.settings.sandbox = false; - virtualisation.emptyDiskImages = [ 4096 ]; - boot.initrd.postDeviceCommands = '' - ${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb - ''; + virtualisation.emptyDiskImages = [ + { + size = 4096; + driveConfig.deviceExtraOpts.serial = "deferred"; + } + ]; virtualisation.fileSystems = { - "/efi" = { - device = "/dev/disk/by-label/EFISYS"; + "/deferred" = { + device = "/dev/disk/by-id/virtio-deferred"; fsType = "vfat"; + autoFormat = true; options = [ "noauto" ]; }; }; @@ -87,10 +90,9 @@ # Test deferred mount with subtest("Deferred mounts work"): - machine.fail("mountpoint -q /efi") # was deferred - machine.execute("mkdir -p /efi") - machine.succeed("mount /dev/disk/by-label/EFISYS /efi") - machine.succeed("mountpoint -q /efi") # now mounted + machine.fail("mountpoint -q /deferred") # was deferred + machine.systemctl("start deferred.mount") + machine.succeed("mountpoint -q /deferred") # now mounted # Test Nix dæmon usage From b9057606a5334caca626dc22277e2b85df25c04b Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 16 Aug 2025 14:12:31 -0400 Subject: [PATCH 56/61] nixos/tests/moosefs: Use autoFormat --- nixos/tests/moosefs.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/tests/moosefs.nix b/nixos/tests/moosefs.nix index 3166d34bf14a..9b4ccba08b8a 100644 --- a/nixos/tests/moosefs.nix +++ b/nixos/tests/moosefs.nix @@ -22,15 +22,18 @@ let chunkserver = { pkgs, ... }: { - virtualisation.emptyDiskImages = [ 4096 ]; - boot.initrd.postDeviceCommands = '' - ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb - ''; + virtualisation.emptyDiskImages = [ + { + size = 4096; + driveConfig.deviceExtraOpts.serial = "data"; + } + ]; fileSystems = pkgs.lib.mkVMOverride { "/data" = { - device = "/dev/disk/by-label/data"; + device = "/dev/disk/by-id/virtio-data"; fsType = "ext4"; + autoFormat = true; }; }; From e31cb2587707ac6dfeebc048083e11903541c2c5 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 16 Aug 2025 14:12:31 -0400 Subject: [PATCH 57/61] nixos/tests/orangefs: Use autoFormat --- nixos/tests/orangefs.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/tests/orangefs.nix b/nixos/tests/orangefs.nix index fe9335f74981..5c88a481b709 100644 --- a/nixos/tests/orangefs.nix +++ b/nixos/tests/orangefs.nix @@ -5,16 +5,19 @@ let { pkgs, ... }: { networking.firewall.allowedTCPPorts = [ 3334 ]; - boot.initrd.postDeviceCommands = '' - ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb - ''; - virtualisation.emptyDiskImages = [ 4096 ]; + virtualisation.emptyDiskImages = [ + { + size = 4096; + driveConfig.deviceExtraOpts.serial = "data"; + } + ]; virtualisation.fileSystems = { "/data" = { - device = "/dev/disk/by-label/data"; + device = "/dev/disk/by-id/virtio-data"; fsType = "ext4"; + autoFormat = true; }; }; From e2e7ac25049773709e07f04003af7fdf8532f936 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 16 Aug 2025 14:12:31 -0400 Subject: [PATCH 58/61] nixos/tests/saunafs: Use autoFormat --- nixos/tests/saunafs.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/tests/saunafs.nix b/nixos/tests/saunafs.nix index cc0c9e941372..0d89fb0c0b3b 100644 --- a/nixos/tests/saunafs.nix +++ b/nixos/tests/saunafs.nix @@ -20,15 +20,18 @@ let chunkserver = { pkgs, ... }: { - virtualisation.emptyDiskImages = [ 4096 ]; - boot.initrd.postDeviceCommands = '' - ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb - ''; + virtualisation.emptyDiskImages = [ + { + size = 4096; + driveConfig.deviceExtraOpts.serial = "data"; + } + ]; fileSystems = pkgs.lib.mkVMOverride { "/data" = { - device = "/dev/disk/by-label/data"; + device = "/dev/disk/by-id/virtio-data"; fsType = "ext4"; + autoFormat = true; }; }; From bb51c2d8fe4ba70d5400932f625c1e828708a60c Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 16 Aug 2025 14:12:31 -0400 Subject: [PATCH 59/61] nixos/tests/snapper: Use autoFormat --- nixos/tests/snapper.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/tests/snapper.nix b/nixos/tests/snapper.nix index 4a03b85cc71d..b8a86c51d694 100644 --- a/nixos/tests/snapper.nix +++ b/nixos/tests/snapper.nix @@ -5,16 +5,18 @@ nodes.machine = { pkgs, lib, ... }: { - boot.initrd.postDeviceCommands = '' - ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux /dev/vdb - ''; - - virtualisation.emptyDiskImages = [ 4096 ]; + virtualisation.emptyDiskImages = [ + { + size = 4096; + driveConfig.deviceExtraOpts.serial = "aux"; + } + ]; virtualisation.fileSystems = { "/home" = { - device = "/dev/disk/by-label/aux"; + device = "/dev/disk/by-id/virtio-aux"; fsType = "btrfs"; + autoFormat = true; }; }; services.snapper.configs.home.SUBVOLUME = "/home"; From 328b6d874bd3c7fb4b9a327e73b1af072a41de44 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sat, 16 Aug 2025 14:12:31 -0400 Subject: [PATCH 60/61] nixos/tests/swap-file-btrfs: Use autoFormat --- nixos/tests/swap-file-btrfs.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/tests/swap-file-btrfs.nix b/nixos/tests/swap-file-btrfs.nix index d074a781ce0a..620639ae893f 100644 --- a/nixos/tests/swap-file-btrfs.nix +++ b/nixos/tests/swap-file-btrfs.nix @@ -5,20 +5,18 @@ meta.maintainers = with lib.maintainers; [ oxalica ]; nodes.machine = - { pkgs, ... }: + { config, pkgs, ... }: { virtualisation.useDefaultFilesystems = false; virtualisation.rootDevice = "/dev/vda"; - boot.initrd.postDeviceCommands = '' - ${pkgs.btrfs-progs}/bin/mkfs.btrfs --label root /dev/vda - ''; - + boot.initrd.systemd.enable = true; virtualisation.fileSystems = { "/" = { - device = "/dev/disk/by-label/root"; + device = config.virtualisation.rootDevice; fsType = "btrfs"; + autoFormat = true; }; }; From 8a394a88fdecda0f3647da6c5fcef7fd888401d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Aug 2025 21:39:37 +0000 Subject: [PATCH 61/61] gat: 0.25.0 -> 0.25.1 --- pkgs/by-name/ga/gat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix index cac7f8501bd4..23fa9b103ce5 100644 --- a/pkgs/by-name/ga/gat/package.nix +++ b/pkgs/by-name/ga/gat/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gat"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "koki-develop"; repo = "gat"; tag = "v${version}"; - hash = "sha256-be6pV8e1Grw7HSvGrJN4ukCpI+Xu4nKN+ITtb+saVgw="; + hash = "sha256-DgIAAlA7rhMvTovmIZOsJ7KoXizGZXT2GRkTnxOh7L0="; }; - vendorHash = "sha256-AaDFeDZMMDrIRqYFR+b4nrmLf13KUMEEE1zUHpVQxTg="; + vendorHash = "sha256-Aq+wcBeYpKWwXgGUZbAqT0zm1Bri7Df3rt7ycwy060o="; env.CGO_ENABLED = 0;