From 6c3ae0b70e4d5b1ebae495bad867c0e837e54068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Bori?= Date: Sun, 7 Sep 2025 22:42:17 +0200 Subject: [PATCH 0001/1079] fishPlugins.ai: init at 0-unstable-2025-02-14 --- pkgs/shells/fish/plugins/ai.nix | 23 +++++++++++++++++++++++ pkgs/shells/fish/plugins/default.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/shells/fish/plugins/ai.nix diff --git a/pkgs/shells/fish/plugins/ai.nix b/pkgs/shells/fish/plugins/ai.nix new file mode 100644 index 000000000000..f63d13ed9af6 --- /dev/null +++ b/pkgs/shells/fish/plugins/ai.nix @@ -0,0 +1,23 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, +}: +buildFishPlugin { + pname = "ai"; + version = "0-unstable-2025-02-14"; + + src = fetchFromGitHub { + owner = "derekstavis"; + repo = "fish-ai"; + rev = "b22952232fbf71287c56c8a09c8be2f938d33b51"; + sha256 = "sha256-ogkbNX+e5qaEbW+iO3na8JC2Xfk/9BndXRm2AcHyOmc="; + }; + + meta = { + description = "Don't remember the command, use AI to figure out"; + homepage = "https://github.com/derekstavis/fish-ai"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ theobori ]; + }; +} diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 22c9dc819e73..802dbf527009 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -8,6 +8,8 @@ lib.makeScope newScope ( self: with self; { + ai = callPackage ./ai.nix { }; + async-prompt = callPackage ./async-prompt.nix { }; autopair = callPackage ./autopair.nix { }; From 023e9300bbd09201741ac4a5924d533d41f74473 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 12 Dec 2025 15:14:38 +0100 Subject: [PATCH 0002/1079] lib/modules: document limitations of 'mkRenamedOptionModule' --- lib/modules.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index e545f9c9707d..e0814d5e2061 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1630,11 +1630,21 @@ let `from` - : 1\. Function argument + : The "from" option path as list of strings. + Option must not exist in the current module set. `to` - : 2\. Function argument + : The "to" option path as list of strings. + Option must already exist in the current module set. + + # Limitations + + - The "to" option must already be declared. + - The "from" option should not be declared, as this function will declare it. + - "to" Options whose types don't support merging at any level of their structure (like `types.raw`, + or `types.attrsOf types.raw` where the attribute values can't merge) are not well-supported + because this function wraps aliased definitions in `mkMerge`. */ mkRenamedOptionModule = from: to: From 4ee2a9a01856d534e7c52ef305995f83306f83bf Mon Sep 17 00:00:00 2001 From: alfarel Date: Wed, 7 Jan 2026 01:28:45 +0000 Subject: [PATCH 0003/1079] keyd: cleanup Remove use of rec and python3.pkgs. Add mainProgram, versionCheckHook. --- pkgs/by-name/ke/keyd/package.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ke/keyd/package.nix b/pkgs/by-name/ke/keyd/package.nix index 406f3d2fe3c5..3faaee367268 100644 --- a/pkgs/by-name/ke/keyd/package.nix +++ b/pkgs/by-name/ke/keyd/package.nix @@ -4,10 +4,10 @@ fetchFromGitHub, systemd, runtimeShell, - python3, + python3Packages, nixosTests, + versionCheckHook, }: - let version = "2.6.0"; @@ -18,28 +18,26 @@ let hash = "sha256-l7yjGpicX1ly4UwF7gcOTaaHPRnxVUMwZkH70NDLL5M="; }; - pypkgs = python3.pkgs; - - appMap = pypkgs.buildPythonApplication rec { + appMap = python3Packages.buildPythonApplication (finalAttrs: { pname = "keyd-application-mapper"; inherit version src; pyproject = false; postPatch = '' - substituteInPlace scripts/${pname} \ + substituteInPlace scripts/${finalAttrs.pname} \ --replace-fail /bin/sh ${runtimeShell} ''; - propagatedBuildInputs = with pypkgs; [ xlib ]; + propagatedBuildInputs = with python3Packages; [ xlib ]; dontBuild = true; installPhase = '' - install -Dm555 -t $out/bin scripts/${pname} + install -Dm555 -t $out/bin scripts/${finalAttrs.pname} ''; meta.mainProgram = "keyd-application-mapper"; - }; + }); in stdenv.mkDerivation { @@ -58,10 +56,10 @@ stdenv.mkDerivation { buildInputs = [ systemd ]; - enableParallelBuilding = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; - # post-2.4.2 may need this to unbreak the test - # makeFlags = [ "SOCKET_PATH/run/keyd/keyd.socket" ]; + enableParallelBuilding = true; postInstall = '' ln -sf ${lib.getExe appMap} $out/bin/${appMap.pname} @@ -74,6 +72,7 @@ stdenv.mkDerivation { description = "Key remapping daemon for Linux"; homepage = "https://github.com/rvaiya/keyd"; license = lib.licenses.mit; + mainProgram = "keyd"; maintainers = with lib.maintainers; [ alfarel ]; platforms = lib.platforms.linux; }; From f7eefe7eb2ccae6148e218fbd165c246b2a1b236 Mon Sep 17 00:00:00 2001 From: alfarel Date: Wed, 7 Jan 2026 01:38:49 +0000 Subject: [PATCH 0004/1079] nixos/keyd: cleanup --- nixos/modules/services/hardware/keyd.nix | 133 +++++++++++------------ 1 file changed, 66 insertions(+), 67 deletions(-) diff --git a/nixos/modules/services/hardware/keyd.nix b/nixos/modules/services/hardware/keyd.nix index 53fa97484ec6..0fbdfe2087eb 100644 --- a/nixos/modules/services/hardware/keyd.nix +++ b/nixos/modules/services/hardware/keyd.nix @@ -5,62 +5,67 @@ ... }: let + inherit (lib) types; + inherit (lib.attrsets) mapAttrs' mapAttrsToList nameValuePair; + inherit (lib.generators) toINI; + inherit (lib.modules) mkDefault mkIf mkRemovedOptionModule; + inherit (lib.options) literalExpression mkEnableOption mkOption; + inherit (lib.strings) concatStringsSep; + cfg = config.services.keyd; - keyboardOptions = - { ... }: - { - options = { - ids = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ "*" ]; - example = [ - "*" - "-0123:0456" - ]; - description = '' - Device identifiers, as shown by {manpage}`keyd(1)`. - ''; - }; + keyboardOptions = { + options = { + ids = mkOption { + type = with types; listOf str; + default = [ "*" ]; + example = [ + "*" + "-0123:0456" + ]; + description = '' + Device identifiers, as shown by {manpage}`keyd(1)`. + ''; + }; - settings = lib.mkOption { - type = (pkgs.formats.ini { }).type; - default = { }; - example = { - main = { - capslock = "overload(control, esc)"; - rightalt = "layer(rightalt)"; - }; - - rightalt = { - j = "down"; - k = "up"; - h = "left"; - l = "right"; - }; + settings = mkOption { + inherit (pkgs.formats.ini { }) type; + default = { }; + example = { + main = { + capslock = "overload(control, esc)"; + rightalt = "layer(rightalt)"; }; - description = '' - Configuration, except `ids` section, that is written to {file}`/etc/keyd/.conf`. - Appropriate names can be used to write non-alpha keys, for example "equal" instead of "=" sign (see ). - See how to configure. - ''; - }; - extraConfig = lib.mkOption { - type = lib.types.lines; - default = ""; - example = '' - [control+shift] - h = left - ''; - description = '' - Extra configuration that is appended to the end of the file. - **Do not** write `ids` section here, use a separate option for it. - You can use this option to define compound layers that must always be defined after the layer they are comprised. - ''; + rightalt = { + j = "down"; + k = "up"; + h = "left"; + l = "right"; + }; }; + description = '' + Configuration, except `ids` section, that is written to {file}`/etc/keyd/.conf`. + Appropriate names can be used to write non-alpha keys, for example "equal" instead of "=" sign (see ). + See how to configure. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + [control+shift] + h = left + ''; + description = '' + Extra configuration that is appended to the end of the file. + **Do not** write `ids` section here, use a separate option for it. + You can use this option to define compound layers that must always be defined after the layer they are comprised. + ''; }; }; + }; in { imports = [ @@ -73,14 +78,14 @@ in ]; options.services.keyd = { - enable = lib.mkEnableOption "keyd, a key remapping daemon"; + enable = mkEnableOption "keyd, a key remapping daemon"; package = lib.mkPackageOption pkgs "keyd" { }; - keyboards = lib.mkOption { - type = lib.types.attrsOf (lib.types.submodule keyboardOptions); + keyboards = mkOption { + type = with types; attrsOf (submodule keyboardOptions); default = { }; - example = lib.literalExpression '' + example = literalExpression '' { default = { ids = [ "*" ]; @@ -106,22 +111,22 @@ in }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { # Creates separate files in the `/etc/keyd/` directory for each key in the dictionary - environment.etc = lib.mapAttrs' ( + environment.etc = mapAttrs' ( name: options: - lib.nameValuePair "keyd/${name}.conf" { + nameValuePair "keyd/${name}.conf" { text = '' [ids] - ${lib.concatStringsSep "\n" options.ids} + ${concatStringsSep "\n" options.ids} - ${lib.generators.toINI { } options.settings} + ${toINI { } options.settings} ${options.extraConfig} ''; } ) cfg.keyboards; - hardware.uinput.enable = lib.mkDefault true; + hardware.uinput.enable = mkDefault true; systemd.services.keyd = { description = "Keyd remapping daemon"; @@ -129,18 +134,12 @@ in wantedBy = [ "multi-user.target" ]; - restartTriggers = lib.mapAttrsToList ( - name: options: config.environment.etc."keyd/${name}.conf".source + restartTriggers = mapAttrsToList ( + name: _options: config.environment.etc."keyd/${name}.conf".source ) cfg.keyboards; - # this is configurable in 2.4.2, later versions seem to remove this option. - # post-2.4.2 may need to set makeFlags in the derivation: - # - # makeFlags = [ "SOCKET_PATH/run/keyd/keyd.socket" ]; - environment.KEYD_SOCKET = "/run/keyd/keyd.sock"; - serviceConfig = { - ExecStart = lib.getExe' cfg.package "keyd"; + ExecStart = lib.getExe cfg.package; Restart = "always"; # TODO investigate why it doesn't work propeprly with DynamicUser From 9f3fa31c0e8f436c3ab28f48ecfd151f71da5e70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Feb 2026 19:23:16 +0000 Subject: [PATCH 0005/1079] pdftoipe: 7.2.29.1 -> 7.2.29.2 --- pkgs/by-name/pd/pdftoipe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdftoipe/package.nix b/pkgs/by-name/pd/pdftoipe/package.nix index 54593bfc433d..761e2582077b 100644 --- a/pkgs/by-name/pd/pdftoipe/package.nix +++ b/pkgs/by-name/pd/pdftoipe/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "pdftoipe"; - version = "7.2.29.1"; + version = "7.2.29.2"; src = fetchFromGitHub { owner = "otfried"; repo = "ipe-tools"; rev = "v${version}"; - hash = "sha256-6FI0ZLRrDmNFAKyht7hB94MsCy+TasD6Mb/rx6sdCdg="; + hash = "sha256-BLZKOq7/3QSuwR0yjrDiiIh9N93qk8ihbEPIQ2h+Ffc="; }; sourceRoot = "${src.name}/pdftoipe"; From fd300c2df73ae56559f7acb7ba5023aad0933ec9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Feb 2026 03:22:54 +0000 Subject: [PATCH 0006/1079] python3Packages.stumpy: 1.13.0 -> 1.14.1 --- pkgs/development/python-modules/stumpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 08dd9f0a0785..e3b6cca1a948 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "stumpy"; - version = "1.13.0"; + version = "1.14.1"; pyproject = true; src = fetchFromGitHub { owner = "TDAmeritrade"; repo = "stumpy"; tag = "v${version}"; - hash = "sha256-S+Rb6pHphXfbqz4VMnN1p7ZrlWB/g7XCdy/T5/Q8VD8="; + hash = "sha256-wBOOYN9UVjc+++lYzgL2+ZqyhLTZOpd5baxYRi2HFJA="; }; build-system = [ From b7b4b005f513af76623b8cb2a13c4a9bdfb1959c Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Mon, 2 Mar 2026 20:13:34 +0100 Subject: [PATCH 0007/1079] docs/readme: add 'examples first' convention --- doc/README.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/doc/README.md b/doc/README.md index c8e0189a2a19..abb07f6ff3dd 100644 --- a/doc/README.md +++ b/doc/README.md @@ -217,6 +217,38 @@ Not everything has been migrated to this format yet. Please always use it for new content. When changing existing content, update formatting if possible, but avoid excessive diffs. +### Examples first + +Readers look at examples first: an example communicates what something does faster than a description. +Put examples before detailed explanations. + +Prefer this structure for each documented item: + +1. Title +2. Abstract (optional, one sentence max, the example often speaks for itself) +3. Example +4. Explanation (details, edge cases, types, defaults) + +For instance: + +````markdown +## `lib.toUpper` + +Converts all characters in a string to uppercase. + +:::{.example #ex-lib-toUpper} +# Converting a string to uppercase +```nix +lib.toUpper "hello" +=> "HELLO" +``` + +::: + +Only acts on ASCII characters. +Unicode characters are passed through unchanged. +```` + ### Writing Function Documentation Function documentation is *reference documentation*, for which From 8590bd26baaeeea8fcf000af456f1921e38cc843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20K=C3=B6nig?= Date: Sat, 28 Mar 2026 20:51:45 +0100 Subject: [PATCH 0008/1079] vesktop: add "x-scheme-handler/discord" mime type This has been added in [Vencord/Vesktop#813][0]. [0]: https://github.com/Vencord/Vesktop/pull/813/changes --- pkgs/by-name/ve/vesktop/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index bed9156bf587..7edfe99c38d0 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -178,6 +178,9 @@ stdenv.mkDerivation (finalAttrs: { "InstantMessaging" "Chat" ]; + mimeTypes = [ + "x-scheme-handler/discord" + ]; }); passthru = { From 51a87105129d3ba4cbae3a06da751f981d271e21 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 16 Mar 2026 04:45:28 +0100 Subject: [PATCH 0009/1079] ob-xf: init at 1.0.3 --- pkgs/by-name/ob/ob-xf/package.nix | 99 +++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 pkgs/by-name/ob/ob-xf/package.nix diff --git a/pkgs/by-name/ob/ob-xf/package.nix b/pkgs/by-name/ob/ob-xf/package.nix new file mode 100644 index 000000000000..903840edf8f7 --- /dev/null +++ b/pkgs/by-name/ob/ob-xf/package.nix @@ -0,0 +1,99 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gitUpdater, + cmake, + pkg-config, + alsa-lib, + freetype, + fontconfig, + libjack2, + libGL, + libx11, + libxcursor, + libxext, + libxinerama, + libxrandr, + writableTmpDirAsHomeHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ob-xf"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "surge-synthesizer"; + repo = "OB-Xf"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-MeknY3jiUTcnX29AtdYNci4dAF1uFCZRpwrxEH3YEEM="; + }; + + postPatch = '' + # The build calls git at configure time to determine version info. + # Provide a static BUILD_VERSION file so git is not required. + cat > BUILD_VERSION < Date: Mon, 30 Mar 2026 19:46:19 +0300 Subject: [PATCH 0010/1079] maintainers: add Marker06 --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5ad86c2b1db6..d9bf62153cad 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16584,6 +16584,13 @@ githubId = 20665331; name = "Mark"; }; + Marker06 = { + email = "linuxenjoyerfi@proton.me"; + github = "Marker06"; + githubId = 148945811; + name = "Marcus"; + matrix = "@marker06:matrix.org"; + }; markus1189 = { email = "markus1189@gmail.com"; github = "markus1189"; From 47f8355c8a0b2e4084f89c581e12bd8971676cdd Mon Sep 17 00:00:00 2001 From: Marker06 Date: Mon, 30 Mar 2026 19:48:04 +0300 Subject: [PATCH 0011/1079] extract-xiso: init at 202505152050 --- pkgs/by-name/ex/extract-xiso/package.nix | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/ex/extract-xiso/package.nix diff --git a/pkgs/by-name/ex/extract-xiso/package.nix b/pkgs/by-name/ex/extract-xiso/package.nix new file mode 100644 index 000000000000..c8b6f4bea091 --- /dev/null +++ b/pkgs/by-name/ex/extract-xiso/package.nix @@ -0,0 +1,33 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "extract-xiso"; + version = "202505152050"; + + src = fetchFromGitHub { + owner = "XboxDev"; + repo = "extract-xiso"; + tag = "build-${finalAttrs.version}"; + hash = "sha256-KZxnS63MhpmzwxCPFi+op5l/vM6P9GYc+SXmNFmEyc8="; + }; + + buildInputs = [ cmake ]; + + doCheck = true; + + meta = { + description = "Command line utility created by in to allow the creation, modification, and extraction of XISOs (Xbox ISOs)"; + homepage = "https://github.com/XboxDev/extract-xiso"; + license = lib.licenses.bsdOriginal; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + Marker06 + ]; + }; + +}) From 94d2a37b2a6e638f61a24a5ddf6fb172d298076b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Apr 2026 07:40:20 +0000 Subject: [PATCH 0012/1079] lsp-plugins: 1.2.27 -> 1.2.29 --- pkgs/by-name/ls/lsp-plugins/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix index 3b59f0e8b037..5efb69144bb9 100644 --- a/pkgs/by-name/ls/lsp-plugins/package.nix +++ b/pkgs/by-name/ls/lsp-plugins/package.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "lsp-plugins"; - version = "1.2.27"; + version = "1.2.29"; outputs = [ "out" @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${finalAttrs.version}/lsp-plugins-src-${finalAttrs.version}.tar.gz"; - hash = "sha256-AirMrXIb7ShPrURdzImss7nR8Scxkh2+HtvQzeZy4aM="; + hash = "sha256-QEKXw63YecUI2wbVEZ4R78HQRzUn0qae057HfB0ZcvI="; }; # By default, GStreamer plugins are installed right alongside GStreamer itself From a86d6ed9b1aa42abace60a1f70676c26c9326c75 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 16 Apr 2026 16:06:03 +0200 Subject: [PATCH 0013/1079] nixos/acme: make webroot world-readable at creation Up to now, the webroot mechanism wasn't usable without extra steps when the certificate was not intended for the web server. In my case, I wanted to obtain a certificate for use in other services from a private CA, but validate via a webroot served by nginx. The (sensibly!) restrictive umask of acme-$name.service led to the webroot being created with o-rx permissions, which meant that nginx could not serve the webroot and the certificate could not be obtained. This retains the mkdir invocation as a best-effort attempt to create the webroot if for example the state has been cleared since systemd-tmpfiles setup, but relies primarily on systemd-tmpfiles to create the webroots with appropriate permissions. --- nixos/modules/security/acme/default.nix | 26 +++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 2a2e816512e9..95f60c80867d 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -443,13 +443,16 @@ let done ${lib.optionalString (data.webroot != null) '' - # Ensure the webroot exists. Fixing group is required in case configuration was changed between runs. + # Ensure the webroot exists. # Lego will fail if the webroot does not exist at all. ( - mkdir -p '${data.webroot}/.well-known/acme-challenge' \ - && chgrp '${data.group}' ${data.webroot}/.well-known/acme-challenge + # If creating the webroot dir, make it world-readable so that the + # web server can access it regardless of whether the certificate + # is actually being generated for this web server. + umask 0022 \ + && mkdir -p '${data.webroot}/.well-known/acme-challenge' ) || ( - echo 'Please ensure ${data.webroot}/.well-known/acme-challenge exists and is writable by acme:${data.group}' \ + echo 'Please ensure ${data.webroot}/.well-known/acme-challenge exists and is writable by the user ${user}.' \ && exit 1 ) ''} @@ -1281,6 +1284,21 @@ in ) (lib.groupBy (conf: conf.accountHash) (lib.attrValues certConfigs)); in accountTargets; + + systemd.tmpfiles.settings."10-acme" = + lib.genAttrs + (lib.concatMap (dir: [ + dir + (dir + "/.well-known") + (dir + "/.well-known/acme-challenge") + ]) webroots) + (dir: { + "d" = { + inherit user; + group = "acme"; + mode = "0755"; + }; + }); }) ]; From d25d63903113ef973cc627ebc63641eb9900a40b Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Thu, 16 Apr 2026 16:41:56 +0200 Subject: [PATCH 0014/1079] nixos/acme: remove scripted webroot creation Situations where systemd-tmpfiles rules aren't applied but acme-$name.service is rerun are quite unlikely, so it should be fine to remove the mkdir completely. --- nixos/modules/security/acme/default.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 95f60c80867d..1d69922a4046 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -441,21 +441,6 @@ let chown -R ${user}:${data.group} "$fixpath" fi done - - ${lib.optionalString (data.webroot != null) '' - # Ensure the webroot exists. - # Lego will fail if the webroot does not exist at all. - ( - # If creating the webroot dir, make it world-readable so that the - # web server can access it regardless of whether the certificate - # is actually being generated for this web server. - umask 0022 \ - && mkdir -p '${data.webroot}/.well-known/acme-challenge' - ) || ( - echo 'Please ensure ${data.webroot}/.well-known/acme-challenge exists and is writable by the user ${user}.' \ - && exit 1 - ) - ''} ''; }; From 07841512d2dc3014f82bdd37fe072e0611eaf43f Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 1 Apr 2026 14:46:40 +0200 Subject: [PATCH 0015/1079] nixos/tests/etc-overlay-mutable: add regression test for opaque upperdir When a directory is created in /etc that does not yet exist in the overlay's lowerdir, overlayfs marks it opaque in the upperdir. This is correct at creation time, but becomes stale when a later generation adds entries under that directory: the opaque marker hides them. stage-2-init.sh runs `install -d /etc/nixos` on every boot. When /nixos is absent from the metadata layer, /.rw-etc/upper/nixos becomes opaque. Switching to a generation that adds environment.etc."nixos/*" then silently fails to expose those entries in /etc. Add a failing regression test that exercises both the switch-to-configuration path and the initrd/boot path. Reproduces #505475 --- .../tests/activation/etc-overlay-mutable.nix | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/nixos/tests/activation/etc-overlay-mutable.nix b/nixos/tests/activation/etc-overlay-mutable.nix index 21d7b7fa6f89..edf81151fd83 100644 --- a/nixos/tests/activation/etc-overlay-mutable.nix +++ b/nixos/tests/activation/etc-overlay-mutable.nix @@ -27,6 +27,12 @@ specialisation.new-generation.configuration = { environment.etc."newgen".text = "newgen"; + # Regression test for https://github.com/NixOS/nixpkgs/issues/505475: + # A symlink in a subdirectory that does not exist in the base generation's + # lowerdir. If something creates that subdirectory at runtime before + # switching (e.g. stage-2-init.sh creating /etc/nixos), overlayfs makes it + # opaque, hiding lowerdir content added by the new generation. + environment.etc."nixos/newlink".source = pkgs.emptyDirectory; }; specialisation.newer-generation.configuration = { environment.etc."newergen".text = "newergen"; @@ -53,6 +59,13 @@ machine.succeed("stat --format '%F' /etc/modetest2 | tee /dev/stderr | grep -Eq '^regular file$'") machine.succeed("stat --format '%a' /etc/modetest2 | tee /dev/stderr | grep -Eq '^300$'") + with subtest("/etc/nixos created by stage-2-init is opaque in upperdir"): + # stage-2-init.sh unconditionally runs `install -d /etc/nixos`. Since + # /nixos is not in the lowerdir, overlayfs creates it as an opaque dir + # in the upperdir. Verify this precondition for the regression test below. + machine.succeed("test -d /.rw-etc/upper/nixos") + print(machine.succeed("getfattr -h -d -m 'trusted.overlay' /.rw-etc/upper/nixos 2>&1 || true")) + with subtest("switching to the same generation"): machine.succeed("/run/current-system/bin/switch-to-configuration test") @@ -77,6 +90,15 @@ assert machine.succeed("cat /etc/newgen") == "newgen" assert machine.succeed("cat /etc/mutable") == "mutable" + # Regression test for https://github.com/NixOS/nixpkgs/issues/505475: + # The opaque /etc/nixos in the upperdir (created by stage-2-init.sh + # before /nixos existed in the lowerdir) must not hide lowerdir entries + # added by the new generation. The activation script must have cleared + # the stale opaque marker. + print(machine.succeed("ls -la /etc/nixos/")) + machine.succeed("test -L /etc/nixos/newlink") + machine.fail("getfattr -h -n trusted.overlay.opaque /.rw-etc/upper/nixos") + print(machine.succeed("findmnt /etc/mountpoint")) print(machine.succeed("stat /etc/mountpoint/extra-file")) print(machine.succeed("findmnt /etc/filemount")) @@ -93,5 +115,19 @@ numOfMetaMounts = len(metaMounts.splitlines()) assert numOfTmpMounts == 0, f"Found {numOfTmpMounts} remaining tmpmounts" assert numOfMetaMounts == 1, f"Found {numOfMetaMounts} remaining metamounts" + + with subtest("stale opaque markers are cleared by initrd on boot (NixOS/nixpkgs#505475)"): + # Simulate the bug precondition: an opaque /pam.d in the upperdir. + # /pam.d is guaranteed to exist as a directory in the metadata layer. + machine.succeed("mkdir -p /.rw-etc/upper/pam.d") + machine.succeed("setfattr -h -n trusted.overlay.opaque -v y /.rw-etc/upper/pam.d") + machine.succeed("getfattr -h -n trusted.overlay.opaque /.rw-etc/upper/pam.d") + + # Reboot and verify the initrd rw-etc service cleared the opaque marker. + machine.shutdown() + machine.start() + machine.wait_for_unit("multi-user.target") + machine.fail("getfattr -h -n trusted.overlay.opaque /.rw-etc/upper/pam.d") + machine.succeed("test -e /etc/pam.d/login") ''; } From bb438ccfad2bb11107289f098422d76a5348e788 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Apr 2026 02:38:01 +0000 Subject: [PATCH 0016/1079] vscode-js-debug: 1.104.0 -> 1.117.0 --- pkgs/by-name/vs/vscode-js-debug/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vs/vscode-js-debug/package.nix b/pkgs/by-name/vs/vscode-js-debug/package.nix index dd7e5d9b4032..11ce7fcf7d10 100644 --- a/pkgs/by-name/vs/vscode-js-debug/package.nix +++ b/pkgs/by-name/vs/vscode-js-debug/package.nix @@ -15,16 +15,16 @@ }: buildNpmPackage rec { pname = "vscode-js-debug"; - version = "1.104.0"; + version = "1.117.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-js-debug"; rev = "v${version}"; - hash = "sha256-CoR3ezhyIQtt5ZlTjfJSNvfMX47U5xSJdzsMN5dkUGI="; + hash = "sha256-1Mj7nfX5iVO0hhydCV/VbqN1x77WFEzG6/ahk1kN1fw="; }; - npmDepsHash = "sha256-bX4p0LQIL4XF0rL5dnBAvR6Ut+YZ1H676Mu/uCedNtU="; + npmDepsHash = "sha256-uTtA5XjHfuI2e9IuNAYfDNKZE8c/wa+CWqAsmd/M3Xk="; nativeBuildInputs = [ pkg-config From 3c5db5ceba893467cee119845b10588fd8309b0b Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sun, 19 Apr 2026 22:33:18 +0200 Subject: [PATCH 0017/1079] nixos-init: add clear-etc-opaque entrypoint The mutable /etc overlay can accumulate stale trusted.overlay.opaque xattrs in its upperdir that hide lowerdir entries added by later generations (see NixOS/nixpkgs#505475). The fixup needs to run in initrd before the overlay is mounted, so we don't want to use bash for this. Add a small clear-etc-opaque entrypoint to the nixos-init binary that walks the metadata layer and removes the opaque xattr from matching upperdir directories. This adds the xattr crate and one extra symlink to the initrd. --- pkgs/by-name/ni/nixos-init/Cargo.lock | 11 ++ pkgs/by-name/ni/nixos-init/Cargo.toml | 1 + pkgs/by-name/ni/nixos-init/README.md | 3 + pkgs/by-name/ni/nixos-init/package.nix | 1 + pkgs/by-name/ni/nixos-init/src/etc_overlay.rs | 170 ++++++++++++++++++ pkgs/by-name/ni/nixos-init/src/lib.rs | 2 + pkgs/by-name/ni/nixos-init/src/main.rs | 3 +- 7 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ni/nixos-init/src/etc_overlay.rs diff --git a/pkgs/by-name/ni/nixos-init/Cargo.lock b/pkgs/by-name/ni/nixos-init/Cargo.lock index 5aee8eedf701..e9d0c98cb115 100644 --- a/pkgs/by-name/ni/nixos-init/Cargo.lock +++ b/pkgs/by-name/ni/nixos-init/Cargo.lock @@ -142,6 +142,7 @@ dependencies = [ "serde", "serde_json", "tempfile", + "xattr", ] [[package]] @@ -506,3 +507,13 @@ checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ "bitflags", ] + +[[package]] +name = "xattr" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" +dependencies = [ + "libc", + "rustix", +] diff --git a/pkgs/by-name/ni/nixos-init/Cargo.toml b/pkgs/by-name/ni/nixos-init/Cargo.toml index 46102be28304..6955ab5f091b 100644 --- a/pkgs/by-name/ni/nixos-init/Cargo.toml +++ b/pkgs/by-name/ni/nixos-init/Cargo.toml @@ -11,6 +11,7 @@ pathrs = "0.2.2" serde = { version = "1.0.228", features = ["derive"] } serde_json = "1.0.145" bootspec = "2.0.0" +xattr = "1.6.1" [dev-dependencies] tempfile = "3.20.0" diff --git a/pkgs/by-name/ni/nixos-init/README.md b/pkgs/by-name/ni/nixos-init/README.md index 4d1677db0015..96b50f3449ce 100644 --- a/pkgs/by-name/ni/nixos-init/README.md +++ b/pkgs/by-name/ni/nixos-init/README.md @@ -52,6 +52,9 @@ closure. Currently nixos-init comes in at ~500 KiB. - `find-etc`: Finds the `/etc` paths in `/sysroot` so that the initrd doesn't directly depend on the toplevel, reducing the need to rebuild the initrd on every generation. +- `clear-etc-opaque`: Clears stale `trusted.overlay.opaque` xattrs from the + mutable `/etc` overlay's upperdir before it is mounted, so that lowerdir + entries added by a new generation are not hidden. - `resolve-in-root`: Figures out the canonical path inside a chroot. ## Future diff --git a/pkgs/by-name/ni/nixos-init/package.nix b/pkgs/by-name/ni/nixos-init/package.nix index c84c711c7599..85d394e10485 100644 --- a/pkgs/by-name/ni/nixos-init/package.nix +++ b/pkgs/by-name/ni/nixos-init/package.nix @@ -47,6 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { binaries = [ "initrd-init" "find-etc" + "clear-etc-opaque" "resolve-in-root" "env-generator" ]; diff --git a/pkgs/by-name/ni/nixos-init/src/etc_overlay.rs b/pkgs/by-name/ni/nixos-init/src/etc_overlay.rs new file mode 100644 index 000000000000..a5c681ff0869 --- /dev/null +++ b/pkgs/by-name/ni/nixos-init/src/etc_overlay.rs @@ -0,0 +1,170 @@ +use std::{ + env, fs, + path::{Path, PathBuf}, +}; + +use anyhow::{Context, Result, bail}; + +const OVERLAY_OPAQUE_XATTR: &str = "trusted.overlay.opaque"; + +/// Entrypoint for the `clear-etc-opaque` binary. +/// +/// When a directory is created in the mutable `/etc` overlay that does not yet +/// exist in the lowerdir, overlayfs marks it opaque in the upperdir. This is +/// correct at creation time, but becomes stale when a later generation adds +/// entries under that same directory to the metadata layer: the opaque marker +/// hides them. +/// +/// This walks the (newly mounted) metadata layer and removes +/// `trusted.overlay.opaque` from any upperdir directory that now has a +/// directory counterpart in the lowerdir, turning it back into a merged view. +/// Files the user placed in the upperdir remain visible (upperdir wins +/// per-entry) and individual whiteouts are preserved; only the blanket hiding +/// of lowerdir content is undone. +/// +/// See . +/// +/// Usage: `clear-etc-opaque ` +pub fn clear_etc_opaque() -> Result<()> { + let args: Vec = env::args().collect(); + + if args.len() != 3 { + bail!("Usage: {} ", args[0]); + } + + let metadata_mount = PathBuf::from(&args[1]); + let upperdir = PathBuf::from(&args[2]); + + if !upperdir.is_dir() { + // Nothing to clear (e.g. first boot before the upperdir is created). + log::info!( + "Upperdir {} does not exist, nothing to clear.", + upperdir.display() + ); + return Ok(()); + } + + clear_opaque_markers(&metadata_mount, &metadata_mount, &upperdir) +} + +/// Recursively walk `current` (a subtree of `metadata_root`) and clear the +/// opaque xattr from the corresponding directory in `upperdir`. +fn clear_opaque_markers(metadata_root: &Path, current: &Path, upperdir: &Path) -> Result<()> { + let entries = fs::read_dir(current) + .with_context(|| format!("Failed to read directory {}", current.display()))?; + + for entry in entries { + let entry = + entry.with_context(|| format!("Failed to read entry in {}", current.display()))?; + + // Use the entry's own type info (no symlink following) so we only + // recurse into real directories of the metadata image. + if !entry + .file_type() + .with_context(|| format!("Failed to stat {}", entry.path().display()))? + .is_dir() + { + continue; + } + + let path = entry.path(); + let rel = path + .strip_prefix(metadata_root) + .context("Failed to strip metadata root prefix")?; + let target = upperdir.join(rel); + + // Only act on real directories in the upperdir; an opaque marker on a + // non-directory would be meaningless and we must not follow symlinks + // out of the upperdir. + match fs::symlink_metadata(&target) { + Ok(meta) if meta.is_dir() => { + remove_opaque_xattr(&target); + // Only recurse when the upperdir also has this directory: + // deeper lowerdir directories without an upperdir counterpart + // cannot carry stale markers. + clear_opaque_markers(metadata_root, &path, upperdir)?; + } + // Missing or not a directory: nothing to do for this subtree. + _ => {} + } + } + + Ok(()) +} + +/// Remove the `trusted.overlay.opaque` xattr from `path` if present. +fn remove_opaque_xattr(path: &Path) { + // Check first instead of removing unconditionally: lremovexattr(2) reports + // a missing attribute as ENODATA, which std does not map to a stable + // io::ErrorKind, so distinguishing it from real errors is awkward. + match xattr::get(path, OVERLAY_OPAQUE_XATTR) { + Ok(None) => return, + Ok(Some(_)) => {} + Err(err) => { + log::warn!( + "Failed to read {OVERLAY_OPAQUE_XATTR} on {}: {err}.", + path.display() + ); + return; + } + } + + match xattr::remove(path, OVERLAY_OPAQUE_XATTR) { + Ok(()) => { + log::info!("Cleared stale opaque marker from {}.", path.display()); + } + Err(err) => { + // Don't abort the boot over this; the worst case is that some + // declaratively-managed /etc entries stay hidden, which is what + // would happen anyway without this fixup. + log::warn!( + "Failed to remove {OVERLAY_OPAQUE_XATTR} from {}: {err}.", + path.display() + ); + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + + use tempfile::tempdir; + + #[test] + fn clears_opaque_only_for_matching_dirs() -> Result<()> { + if !xattr::SUPPORTED_PLATFORM { + return Ok(()); + } + + let metadata = tempdir()?; + let upper = tempdir()?; + + // lowerdir gained nixos/sub in the new generation. + fs::create_dir_all(metadata.path().join("nixos/sub"))?; + // upperdir has an opaque nixos/ from before. + fs::create_dir_all(upper.path().join("nixos"))?; + // upperdir directory without a lowerdir counterpart: we only clear + // markers where the lowerdir has a matching directory, so this one + // must stay opaque. + fs::create_dir_all(upper.path().join("only-upper"))?; + + // The build sandbox usually lacks CAP_SYS_ADMIN, so trusted.* xattrs + // cannot be set. Skip in that case rather than fail the build. + if xattr::set(upper.path().join("nixos"), OVERLAY_OPAQUE_XATTR, b"y").is_err() { + eprintln!("skipping: cannot set trusted.* xattrs in this environment"); + return Ok(()); + } + xattr::set(upper.path().join("only-upper"), OVERLAY_OPAQUE_XATTR, b"y")?; + + clear_opaque_markers(metadata.path(), metadata.path(), upper.path())?; + + assert!(xattr::get(upper.path().join("nixos"), OVERLAY_OPAQUE_XATTR)?.is_none()); + assert_eq!( + xattr::get(upper.path().join("only-upper"), OVERLAY_OPAQUE_XATTR)?.as_deref(), + Some(b"y".as_slice()) + ); + + Ok(()) + } +} diff --git a/pkgs/by-name/ni/nixos-init/src/lib.rs b/pkgs/by-name/ni/nixos-init/src/lib.rs index e9a716724051..c781757c9b82 100644 --- a/pkgs/by-name/ni/nixos-init/src/lib.rs +++ b/pkgs/by-name/ni/nixos-init/src/lib.rs @@ -1,6 +1,7 @@ mod activate; mod config; mod env_generator; +mod etc_overlay; mod find_etc; mod fs; mod init; @@ -16,6 +17,7 @@ use anyhow::{Context, Result, bail}; pub use crate::{ activate::activate, env_generator::env_generator, + etc_overlay::clear_etc_opaque, find_etc::find_etc, init::init, initrd_init::initrd_init, diff --git a/pkgs/by-name/ni/nixos-init/src/main.rs b/pkgs/by-name/ni/nixos-init/src/main.rs index 4f74415b8d36..bef10017f1ea 100644 --- a/pkgs/by-name/ni/nixos-init/src/main.rs +++ b/pkgs/by-name/ni/nixos-init/src/main.rs @@ -2,7 +2,7 @@ use std::{env, io::Write, process::ExitCode}; use log::Level; -use nixos_init::{env_generator, find_etc, initrd_init, resolve_in_root}; +use nixos_init::{clear_etc_opaque, env_generator, find_etc, initrd_init, resolve_in_root}; fn main() -> ExitCode { let arg0 = env::args() @@ -12,6 +12,7 @@ fn main() -> ExitCode { setup_logger(); let entrypoint = match arg0.as_str() { + "clear-etc-opaque" => clear_etc_opaque, "find-etc" => find_etc, "resolve-in-root" => resolve_in_root, "initrd-init" => initrd_init, From 1c7c4d2291cfdace47c1b448aa19a396f99e7036 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Sun, 19 Apr 2026 22:33:54 +0200 Subject: [PATCH 0018/1079] nixos/etc: clear stale opaque markers from mutable overlay upperdir Fix by walking the newly-mounted metadata layer before the overlay is (re)mounted and removing trusted.overlay.opaque from any upperdir directory that now has a counterpart in the lowerdir. This turns those directories back into merged views: user-placed files and individual whiteouts are preserved, only the blanket hiding of lowerdir content is undone. Applied in both the activation script (switch-to-configuration) and the initrd rw-etc service (boot), since the upperdir persists across reboots. Uses the new clear-etc-opaque entrypoint of nixos-init so the initrd stays bash-free. Fixes #505475 --- nixos/modules/system/etc/etc-activation.nix | 19 ++++++++++++++----- nixos/modules/system/etc/etc.nix | 7 +++++++ .../tests/activation/etc-overlay-mutable.nix | 4 ++++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix index 25c3ea7274a6..c294a3a6d436 100644 --- a/nixos/modules/system/etc/etc-activation.nix +++ b/nixos/modules/system/etc/etc-activation.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: @@ -51,6 +50,9 @@ ]; boot.initrd.systemd = { + storePaths = lib.mkIf config.system.etc.overlay.mutable [ + "${config.system.nixos-init.package}/bin/clear-etc-opaque" + ]; mounts = [ { where = "/run/nixos-etc-metadata"; @@ -131,13 +133,20 @@ before = [ "initrd-fs.target" ]; unitConfig = { DefaultDependencies = false; - RequiresMountsFor = "/sysroot"; + RequiresMountsFor = [ + "/sysroot" + # Needed so we can clear stale opaque markers from the + # upperdir based on the contents of the new metadata layer + # before the overlay is mounted. + "/run/nixos-etc-metadata" + ]; }; serviceConfig = { Type = "oneshot"; - ExecStart = '' - /bin/mkdir -p -m 0755 /sysroot/.rw-etc/upper /sysroot/.rw-etc/work - ''; + ExecStart = [ + "/bin/mkdir -p -m 0755 /sysroot/.rw-etc/upper /sysroot/.rw-etc/work" + "${config.system.nixos-init.package}/bin/clear-etc-opaque /run/nixos-etc-metadata /sysroot/.rw-etc/upper" + ]; }; }; }) diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 65d3a5192c45..60f69a7d3a07 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -285,6 +285,13 @@ in tmpMetadataMount=$(TMPDIR="/run" mktemp --directory -t nixos-etc-metadata.XXXXXXXXXX) mount --type erofs --options ro,nodev,nosuid ${config.system.build.etcMetadataImage} "$tmpMetadataMount" + ${lib.optionalString config.system.etc.overlay.mutable '' + # Clear stale opaque markers from the upperdir so that lowerdir + # entries added by the new generation are not hidden. + # See https://github.com/NixOS/nixpkgs/issues/505475 + ${config.system.nixos-init.package}/bin/clear-etc-opaque "$tmpMetadataMount" /.rw-etc/upper + ''} + # There was no previous /etc mounted. This happens when we're called # directly without an initrd, like with nixos-enter. if ! mountpoint -q /etc; then diff --git a/nixos/tests/activation/etc-overlay-mutable.nix b/nixos/tests/activation/etc-overlay-mutable.nix index edf81151fd83..b30ca7b4fd89 100644 --- a/nixos/tests/activation/etc-overlay-mutable.nix +++ b/nixos/tests/activation/etc-overlay-mutable.nix @@ -122,6 +122,10 @@ machine.succeed("mkdir -p /.rw-etc/upper/pam.d") machine.succeed("setfattr -h -n trusted.overlay.opaque -v y /.rw-etc/upper/pam.d") machine.succeed("getfattr -h -n trusted.overlay.opaque /.rw-etc/upper/pam.d") + # Also create a non-opaque upperdir directory that exists in the + # metadata layer, to ensure clear-etc-opaque tolerates the + # already-clear case. + machine.succeed("mkdir -p /.rw-etc/upper/systemd") # Reboot and verify the initrd rw-etc service cleared the opaque marker. machine.shutdown() From 0afa9278be9dd9f1eded17b85c414ad193c12510 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 24 Apr 2026 12:33:49 +0200 Subject: [PATCH 0019/1079] nixos/roundcube: set nginx client_max_body_size for attachments Fixes #506235 This was attempted earlier in #506239 but AFAICT that was the wrong place (nginx precedence rules are tricky). --- nixos/modules/services/mail/roundcube.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index c58832daac19..3c15fbedfc9c 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -190,7 +190,6 @@ in priority = 1100; extraConfig = '' add_header Cache-Control 'public, max-age=604800, must-revalidate'; - client_max_body_size ${toString cfg.maxAttachmentSize}; ''; }; locations."~ ^/(SQL|bin|config|logs|temp|vendor)/" = { @@ -213,6 +212,8 @@ in fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_split_path_info ^(.+\.php)(/.+)$; include ${config.services.nginx.package}/conf/fastcgi.conf; + + client_max_body_size ${toString cfg.maxAttachmentSize}; ''; }; }; From f914d7e320518c8d7ec6f1bc79035ca605c76c63 Mon Sep 17 00:00:00 2001 From: ners Date: Fri, 24 Apr 2026 14:20:38 +0200 Subject: [PATCH 0020/1079] nixos-shell: add updateScript --- pkgs/by-name/ni/nixos-shell/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ni/nixos-shell/package.nix b/pkgs/by-name/ni/nixos-shell/package.nix index 9d42bb2b05d0..aedd88179e0b 100644 --- a/pkgs/by-name/ni/nixos-shell/package.nix +++ b/pkgs/by-name/ni/nixos-shell/package.nix @@ -5,6 +5,7 @@ jq, fetchFromGitHub, makeWrapper, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -32,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: { installFlags = [ "PREFIX=${placeholder "out"}" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Spawns lightweight nixos vms in a shell"; inherit (finalAttrs.src.meta) homepage; From 43e5365edada73b6edea0bc7da197a864d186705 Mon Sep 17 00:00:00 2001 From: ners Date: Fri, 24 Apr 2026 14:21:17 +0200 Subject: [PATCH 0021/1079] nixos-shell: 2.0.0 -> 2.2.0 --- pkgs/by-name/ni/nixos-shell/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixos-shell/package.nix b/pkgs/by-name/ni/nixos-shell/package.nix index aedd88179e0b..237195bb2014 100644 --- a/pkgs/by-name/ni/nixos-shell/package.nix +++ b/pkgs/by-name/ni/nixos-shell/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nixos-shell"; - version = "2.0.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixos-shell"; rev = finalAttrs.version; - sha256 = "sha256-plRKXQqww7easx0wgGKAkOJH1TW/PeeB20dq9XUN8J4="; + sha256 = "sha256-sVlbbhRVpAJ8fcjdwJFXlw9MOpb9aqFmAzDCzDi0jqo="; }; nativeBuildInputs = [ makeWrapper ]; From adc71aa1a270fc5f362a60f4d7d80838bd44ca10 Mon Sep 17 00:00:00 2001 From: Firelight Flagboy Date: Fri, 24 Apr 2026 21:37:00 +0200 Subject: [PATCH 0022/1079] cage: 0.2.1 -> 0.3.0 Remove previously applied patches as it's now upstream in 0.3.0 --- pkgs/by-name/ca/cage/package.nix | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ca/cage/package.nix b/pkgs/by-name/ca/cage/package.nix index 7326ee2dc221..d787ee6dbb18 100644 --- a/pkgs/by-name/ca/cage/package.nix +++ b/pkgs/by-name/ca/cage/package.nix @@ -2,14 +2,13 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, meson, ninja, pkg-config, wayland-scanner, scdoc, makeWrapper, - wlroots_0_19, + wlroots_0_20, wayland, wayland-protocols, pixman, @@ -23,25 +22,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "cage"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "cage-kiosk"; repo = "cage"; tag = "v${finalAttrs.version}"; - hash = "sha256-P9MhIl2YIE2hwT5Yr0Cpes5S12evb0aj9oOPLeehkw0="; + hash = "sha256-NLoz11bfeZwesmwLmyytuB6/vSwIsnDWKzyAXFe+YZ0="; }; - patches = [ - # backport of https://github.com/cage-kiosk/cage/pull/461 - # to fix https://github.com/cage-kiosk/cage/issues/456 - # remove on next release - (fetchpatch { - url = "https://github.com/cage-kiosk/cage/commit/832e88b0c964a324bb09c7af02ed0650b73dfb9b.patch"; - hash = "sha256-8dyJL46xXGkw3pF9uskX8H72s0hUO1BhU2UMaoEwz4U="; - }) - ]; - depsBuildBuild = [ pkg-config ]; @@ -56,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - wlroots_0_19 + wlroots_0_20 wayland wayland-protocols pixman @@ -66,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { libx11 ]; - postFixup = lib.optionalString wlroots_0_19.enableXWayland '' + postFixup = lib.optionalString wlroots_0_20.enableXWayland '' wrapProgram $out/bin/cage --prefix PATH : "${xwayland}/bin" ''; From 590d99ed5f9e0a7250f7fd684542bd8c7f89a626 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:31:40 -0400 Subject: [PATCH 0023/1079] lib/systems: remove old isCompatible --- lib/systems/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index f60ece0c8f5c..eb99498b896a 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -109,9 +109,6 @@ let ) ); - isCompatible = - _: - throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details"; # Derived meta-data useLLVM = final.isFreeBSD || final.isOpenBSD; From 0f0f29fcf1a17717ebd1f0fff951838562198835 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Sun, 26 Apr 2026 21:42:04 -0400 Subject: [PATCH 0024/1079] lib/systems: store version of elaborated system without functions --- lib/systems/default.nix | 32 ++++++++++----- lib/tests/systems.nix | 88 ++++++++++++++++++++++++++--------------- 2 files changed, 79 insertions(+), 41 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index eb99498b896a..2511f8cdd854 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -3,8 +3,6 @@ let inherit (lib) any - attrNames - filter foldl hasInfix isAttrs @@ -36,17 +34,31 @@ let compare the value with a reconstruction of itself, e.g. with `f == a: f a`, or perhaps calling `elaborate` twice, and one will see reflexivity fail as described. - Hence a custom equality test. + To solve this, the elaborated systems also store a version of their data + without any functions to be compared. Note that this does not canonicalize the systems, so you'll want to make sure both arguments have been `elaborate`-d. */ - equals = - let - # System attrs are never __functor-style attrsets, so builtins.isFunction suffices. - removeFunctions = a: removeAttrs a (filter (n: builtins.isFunction a.${n}) (attrNames a)); - in - a: b: removeFunctions a == removeFunctions b; + equals = a: b: a._withoutFunctions == b._withoutFunctions; + + /** + The attribute names within an elaborated system that store functions. + + Due to object identity semantics, `systems.equals` needs a way to compare + all non-function attributes. It does this by storing a version of itself + without any functions under the attribute name `_withoutFunctions`. The + attribute names that contain functions are exposed for regression testing. + */ + functionNames = [ + "canExecute" + "emulator" + "emulatorAvailable" + "staticEmulatorAvailable" + ]; + + # Avoiding infrec + ignoredNames = functionNames ++ [ "_withoutFunctions" ]; /** List of all Nix system doubles the nixpkgs flake will expose the package set @@ -85,6 +97,7 @@ let rust = args.rust or args.rustc or { }; final = { + _withoutFunctions = removeAttrs final ignoredNames; # Prefer to parse `config` as it is strictly more informative. parsed = parse.mkSystemFromString (args.config or allArgs.system); # This can be losslessly-extracted from `parsed` iff parsing succeeds. @@ -646,6 +659,7 @@ in equals examples flakeExposed + functionNames inspect parse platforms diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index e912d18cc73c..2cc8f7aa607e 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -226,10 +226,22 @@ lib.runTests ( expr = toLosslessStringMaybe (lib.systems.elaborate "x86_64-linux"); expected = "x86_64-linux"; }; - test_toLosslessStringMaybe_fail = { - expr = toLosslessStringMaybe (lib.systems.elaborate "x86_64-linux" // { something = "extra"; }); - expected = null; - }; + test_toLosslessStringMaybe_fail = ( + let + baseSystem = lib.systems.elaborate "x86_64-linux"; + in + { + expr = toLosslessStringMaybe ( + baseSystem + // { + _withoutFunctions = baseSystem._withoutFunctions // { + something = "extra"; + }; + } + ); + expected = null; + } + ); test_elaborate_config_over_system = { expr = (lib.systems.elaborate { @@ -255,36 +267,48 @@ lib.runTests ( expected = "i686"; }; } + // { + # equals.functionNames must list exactly the function-valued attrs of an + # elaborated system, so that _withoutFunctions stays correct without + # iterating. + test_equals_functionNames_in_sync = + let + sys = lib.systems.elaborate "x86_64-linux"; + actual = lib.filter (n: builtins.isFunction sys.${n}) (builtins.attrNames sys); + expected = lib.sort lib.lessThan lib.systems.functionNames; + in + { + expr = lib.sort lib.lessThan actual; + inherit expected; + }; + } # Generate test cases to assert that a change in any non-function attribute makes a platform unequal - // - lib.concatMapAttrs - (platformAttrName: origValue: { + // ( + let + # arbitrary choice, just to get all the elaborated attrNames + baseSystem = lib.systems.elaborate "x86_64-linux"; + in + lib.concatMapAttrs (platformAttrName: origValue: { + ${"test_equals_unequal_${platformAttrName}"} = + let + # lib.systems.equals only checks the subattrset + modified = + assert origValue != arbitraryValue; + baseSystem + // { + _withoutFunctions = baseSystem._withoutFunctions // { + ${platformAttrName} = arbitraryValue; + }; + }; + arbitraryValue = x: "<>"; + in + { + expr = lib.systems.equals baseSystem modified; + expected = false; + }; - ${"test_equals_unequal_${platformAttrName}"} = - let - modified = - assert origValue != arbitraryValue; - lib.systems.elaborate "x86_64-linux" // { ${platformAttrName} = arbitraryValue; }; - arbitraryValue = x: "<>"; - in - { - expr = lib.systems.equals (lib.systems.elaborate "x86_64-linux") modified; - expected = - { - # Changes in these attrs are not detectable because they're function. - # The functions should be derived from the data, so this is not a problem. - canExecute = null; - emulator = null; - emulatorAvailable = null; - staticEmulatorAvailable = null; - isCompatible = null; - } ? ${platformAttrName}; - }; - - }) - ( - lib.systems.elaborate "x86_64-linux" # arbitrary choice, just to get all the elaborated attrNames - ) + }) baseSystem + ) ) From bdb94e30e42f67528ec759826a980eea66724267 Mon Sep 17 00:00:00 2001 From: wxlyyy <1556588440@qq.com> Date: Sun, 19 Apr 2026 23:47:14 +0800 Subject: [PATCH 0025/1079] nixos/logiops: init --- .../manual/release-notes/rl-2605.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/hardware/logiops.nix | 61 +++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 nixos/modules/services/hardware/logiops.nix diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 911eb063af97..314ff58d9eb3 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -132,6 +132,8 @@ - [porxie](https://codeberg.org/Blooym/porxie), a correct and efficient ATProto blob proxy for secure content delivery. Available as [services.porxie](#opt-services.porxie.enable). +- [LogiOps](https://github.com/PixlOne/logiops), a unofficial userspace driver for HID++ Logitech devices. Available as [services.logiops](#opt-services.logiops.enable). + ## Backward Incompatibilities {#sec-release-26.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 774140f86d92..ccee5a02bc7a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -686,6 +686,7 @@ ./services/hardware/lcd.nix ./services/hardware/libinput.nix ./services/hardware/lirc.nix + ./services/hardware/logiops.nix ./services/hardware/monado.nix ./services/hardware/nvidia-container-toolkit ./services/hardware/nvidia-optimus.nix diff --git a/nixos/modules/services/hardware/logiops.nix b/nixos/modules/services/hardware/logiops.nix new file mode 100644 index 000000000000..807d169ac6fc --- /dev/null +++ b/nixos/modules/services/hardware/logiops.nix @@ -0,0 +1,61 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.logiops; + configFormat = pkgs.formats.libconfig { }; + configFile = configFormat.generate "logid.cfg" cfg.config; +in +{ + options = { + services.logiops = { + enable = lib.mkEnableOption "LogiOps, a unofficial userspace driver for HID++ Logitech devices"; + + package = lib.mkPackageOption pkgs "logiops" { }; + + config = lib.mkOption { + type = configFormat.type; + default = { }; + example = lib.literalExpression '' + devices = [ + { + name = "Wireless Mouse MX Master"; + dpi = 1000; + smartshift = + { + on = true; + threshold = 30; + torque = 50; + }; + } + ]; + ''; + description = '' + The standard libconfig-style config for LogiOps. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + services.dbus.packages = [ cfg.package ]; + + systemd = { + packages = [ cfg.package ]; + services.logid = { + wantedBy = [ "graphical.target" ]; + serviceConfig.ExecStart = [ + "" + "${lib.getExe cfg.package} -c ${configFile}" + ]; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ bokicoder ]; +} From 9c6c7af4b8e226c1b7edbec68910266f143282f3 Mon Sep 17 00:00:00 2001 From: Hadi Chokr Date: Mon, 27 Apr 2026 18:45:10 +0200 Subject: [PATCH 0026/1079] nixos/systemd: install soft-reboot units Allows running systemctl soft-reboot, to only reboot userspace not full reboot with the kernel included. Signed-off-by: Hadi Chokr --- nixos/modules/system/boot/systemd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index de2168281c80..9c230e11960a 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -143,6 +143,8 @@ let "final.target" "kexec.target" "systemd-kexec.service" + "soft-reboot.target" + "systemd-soft-reboot.service" ] ++ lib.optional cfg.package.withUtmp "systemd-update-utmp.service" ++ [ From c7f825c0fbb6ba2c4889af1130ca6b135026e157 Mon Sep 17 00:00:00 2001 From: "xiaodong.jia" Date: Wed, 29 Apr 2026 10:38:01 +0800 Subject: [PATCH 0027/1079] prometheus-speedtest-exporter: init at 0.0.5 Adds the danopstech speedtest Prometheus exporter (podocarp fork with -listen-address support). https://github.com/danopstech/speedtest_exporter --- .../prometheus-speedtest-exporter/package.nix | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix diff --git a/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix b/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix new file mode 100644 index 000000000000..ab80dae916ee --- /dev/null +++ b/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix @@ -0,0 +1,28 @@ +{ + buildGoModule, + lib, + fetchFromGitHub, +}: + +buildGoModule { + __structuredAttrs = true; + pname = "prometheus-speedtest-exporter"; + version = "0.0.5-unstable-2026-04-29"; + + src = fetchFromGitHub { + owner = "podocarp"; + repo = "speedtest_exporter"; + rev = "e82be2ecb5d0cbcd5a6a21909afed6991b5d7e00"; + hash = "sha256-7uy1rVll7YzM9WeQQKKSiI4nblIPADD6h/5z/diCH4E="; + }; + + vendorHash = "sha256-w113vWnXM4h3zckmj39Qx/oZFaH9Mq0xUSqNxopdQO0="; + + meta = { + description = "Speedtest.net Exporter for the Prometheus monitoring system"; + mainProgram = "speedtest_exporter"; + homepage = "https://github.com/danopstech/speedtest_exporter"; + license = lib.licenses.gpl3Only; + maintainers = [ ]; + }; +} From 7d6226f8560ce7848956070cfed61c81173a2345 Mon Sep 17 00:00:00 2001 From: "xiaodong.jia" Date: Wed, 29 Apr 2026 10:38:11 +0800 Subject: [PATCH 0028/1079] nixos/prometheus-exporters: add speedtest exporter Introduces the NixOS module for the danopstech speedtest Prometheus exporter. Exposes serverID and serverFallback options matching the exporter's CLI flags. --- .../monitoring/prometheus/exporters.nix | 1 + .../prometheus/exporters/speedtest.nix | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/speedtest.nix diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 18a1e30d31fe..53b51fce7fe5 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -119,6 +119,7 @@ let "smartctl" "smokeping" "snmp" + "speedtest" "sql" "statsd" "storagebox" diff --git a/nixos/modules/services/monitoring/prometheus/exporters/speedtest.nix b/nixos/modules/services/monitoring/prometheus/exporters/speedtest.nix new file mode 100644 index 000000000000..da6497293776 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/speedtest.nix @@ -0,0 +1,49 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.prometheus.exporters.speedtest; + inherit (lib) + mkOption + types + concatStringsSep + optionalString + ; +in +{ + extraOpts = { + serverID = mkOption { + type = types.int; + default = -1; + description = '' + Speedtest.net server ID to run tests against. + -1 picks the closest server to your location. + ''; + }; + + serverFallback = mkOption { + type = types.bool; + default = false; + description = '' + If the configured serverID is unavailable, fall back to the closest available server. + ''; + }; + }; + + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-speedtest-exporter}/bin/speedtest_exporter \ + -listen-address ${cfg.listenAddress} \ + -port ${toString cfg.port} \ + -server_id ${toString cfg.serverID} \ + ${optionalString cfg.serverFallback "-server_fallback"} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} From aa2961d365aa4fd71e57a3d4251857970cfd9cfa Mon Sep 17 00:00:00 2001 From: "xiaodong.jia" Date: Wed, 29 Apr 2026 11:07:37 +0800 Subject: [PATCH 0029/1079] nixos/prometheus-exporters: fix missing port for speedtest exporter --- .../services/monitoring/prometheus/exporters/speedtest.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/speedtest.nix b/nixos/modules/services/monitoring/prometheus/exporters/speedtest.nix index da6497293776..143cda300096 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/speedtest.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/speedtest.nix @@ -15,6 +15,8 @@ let ; in { + port = 9798; + extraOpts = { serverID = mkOption { type = types.int; From ce4d1f665ded48cbfa6ed4451e7ea26a5ff03ce7 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Wed, 29 Apr 2026 17:36:26 +0200 Subject: [PATCH 0030/1079] nominatim: 5.2.0 -> 5.3.2 --- pkgs/by-name/no/nominatim/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/nominatim/package.nix b/pkgs/by-name/no/nominatim/package.nix index 49cf33ce65e6..f5b8f182c175 100644 --- a/pkgs/by-name/no/nominatim/package.nix +++ b/pkgs/by-name/no/nominatim/package.nix @@ -21,14 +21,14 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "nominatim"; - version = "5.2.0"; + version = "5.3.2"; pyproject = true; src = fetchFromGitHub { owner = "osm-search"; repo = "Nominatim"; tag = "v${finalAttrs.version}"; - hash = "sha256-ao4oEPz5rtRQtPC2UcIHH1M+o914JraASf+hcB2SDKA="; + hash = "sha256-jP/OkEuFdVdvA8Uztv/49FXm9dsExVDjw2l2gyMOSsg="; }; postPatch = '' @@ -57,6 +57,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyicu python-dotenv pyyaml + mwparserfromhell ]; propagatedBuildInputs = [ From 72a094ca2cd69a03c455790d8f4812853847aec7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Apr 2026 04:09:39 +0000 Subject: [PATCH 0031/1079] render-cli: 2.15.1 -> 2.16.0 --- pkgs/by-name/re/render-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/render-cli/package.nix b/pkgs/by-name/re/render-cli/package.nix index d6696428f678..683d38ae84b4 100644 --- a/pkgs/by-name/re/render-cli/package.nix +++ b/pkgs/by-name/re/render-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "render-cli"; - version = "2.15.1"; + version = "2.16.0"; src = fetchFromGitHub { owner = "render-oss"; repo = "cli"; rev = "v${version}"; - hash = "sha256-a7yYSslRWa4d8TTAw128PukLBamqkpDr2oUUYBRgpCY="; + hash = "sha256-y9XlOMNwqdooj3LcNFIF9gov9KX+WtB8eU0NsjzVuUc="; }; vendorHash = "sha256-K2RKcz5wAP0ZA5g5aDgSsEXKEEncFtO9qamgG3fW02Y="; From b4598a64ea0550d1ef14555df0b29c90d98d8fb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 Apr 2026 19:52:08 +0000 Subject: [PATCH 0032/1079] netbird-dashboard: 2.36.0 -> 2.37.1 --- pkgs/by-name/ne/netbird-dashboard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index 5b7d20f6e909..408b4a483057 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.36.0"; + version = "2.37.1"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-VsecD83dz6U6jEaGIxv7M9ePzbTPCXeffSoyyBr2Vh4="; + hash = "sha256-/mrDwRj6A2reMYdbBphgx+cFqjKwefbyWcSiyUOuU00="; }; - npmDepsHash = "sha256-ljko66NYBgwyvgIbqnexfbSaILNf/74qrNXZUsHT8/o="; + npmDepsHash = "sha256-Ze+1r5Uh+wdm3MuVr93oS2itodx9Zdv+JYO6Uji1saw="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' From 12b1adec9a81bc8aeb7c1b80bf9ddd220cfbd082 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 May 2026 06:38:51 +0000 Subject: [PATCH 0033/1079] noto-fonts: 2026.04.01 -> 2026.05.01 --- pkgs/by-name/no/noto-fonts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 1fb53f8b6dd4..bcff72bf737c 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -23,13 +23,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "noto-fonts${suffix}"; - version = "2026.04.01"; + version = "2026.05.01"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; tag = "noto-monthly-release-${finalAttrs.version}"; - hash = "sha256-f5A9vFTO+TgZTarN0cDmRZfBQxeqedzJp3KdCnua4Yw="; + hash = "sha256-Zph+4YJGSQ5hubzQjKV6YruGciQEle28YMaYyVh8/Ro="; }; nativeBuildInputs = [ From 5a631804a3f43e22884ad32d993c634234f72776 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 May 2026 12:30:01 +0000 Subject: [PATCH 0034/1079] nedit: 5.7 -> 5.8 --- pkgs/by-name/ne/nedit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nedit/package.nix b/pkgs/by-name/ne/nedit/package.nix index 8e54bc06ae7d..fce42db7de94 100644 --- a/pkgs/by-name/ne/nedit/package.nix +++ b/pkgs/by-name/ne/nedit/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "nedit"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "mirror://sourceforge/nedit/nedit-source/nedit-${finalAttrs.version}-src.tar.gz"; - sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd"; + sha256 = "sha256-WFGqclLa2VIIRSkXNkAjJWLexKfEQCCfGW1T1KWoB00="; }; hardeningDisable = [ "format" ]; From 8e65b596270afc07bcd65a8a1230bfa0295706e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 May 2026 12:42:14 +0000 Subject: [PATCH 0035/1079] synthv1: 1.4.1 -> 1.4.2 --- pkgs/by-name/sy/synthv1/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sy/synthv1/package.nix b/pkgs/by-name/sy/synthv1/package.nix index b8c26a5d5eb9..ff1beba9404b 100644 --- a/pkgs/by-name/sy/synthv1/package.nix +++ b/pkgs/by-name/sy/synthv1/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "synthv1"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "mirror://sourceforge/synthv1/synthv1-${finalAttrs.version}.tar.gz"; - hash = "sha256-z4jy6Zo7LaYLf3QoAXl0MvZ9rcZWThWwChGDJBY0HYg="; + hash = "sha256-eoW1Yl/v1LsdvcQen7/LLDt5Q9Yd4kwX3W+CIjQEfYE="; }; postPatch = '' From c1fa146ac1092134b44929d7833a958b5d00298a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 May 2026 12:44:59 +0000 Subject: [PATCH 0036/1079] samplv1: 1.4.1 -> 1.4.2 --- pkgs/by-name/sa/samplv1/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/samplv1/package.nix b/pkgs/by-name/sa/samplv1/package.nix index 1ac6710bc8b0..6d0af33b0830 100644 --- a/pkgs/by-name/sa/samplv1/package.nix +++ b/pkgs/by-name/sa/samplv1/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "samplv1"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "mirror://sourceforge/samplv1/samplv1-${finalAttrs.version}.tar.gz"; - hash = "sha256-siuzbsAkQi909/jBNtz/Lb8gMtxyxh+tiRGuvZ9JUts="; + hash = "sha256-DAD8y9BhVyCxi7VPWLXKkcv6kxFQOOmTDB2ntJiG0Lw="; }; nativeBuildInputs = [ From 39f805e0c853f4a5ff3f7a4cc6e8e4ee71787751 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 May 2026 12:47:12 +0000 Subject: [PATCH 0037/1079] drumkv1: 1.4.1 -> 1.4.2 --- pkgs/by-name/dr/drumkv1/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dr/drumkv1/package.nix b/pkgs/by-name/dr/drumkv1/package.nix index a24be4d5968a..5488398cd331 100644 --- a/pkgs/by-name/dr/drumkv1/package.nix +++ b/pkgs/by-name/dr/drumkv1/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "drumkv1"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "mirror://sourceforge/drumkv1/drumkv1-${finalAttrs.version}.tar.gz"; - hash = "sha256-w9/bdK/qjSeBD5hfHQnGFUGDnUqPgdkM8GQ18Ps+nzM="; + hash = "sha256-jTOTOziCrycFyMe6wIfUnw7d6p+gNZfO7Q9BcZOyOME="; }; buildInputs = [ From cbd6f703e50858f77086a028ab4b8cf3f01a3b61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 May 2026 13:12:56 +0000 Subject: [PATCH 0038/1079] kent: 492 -> 497 --- pkgs/by-name/ke/kent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/kent/package.nix b/pkgs/by-name/ke/kent/package.nix index 741bc115629e..c1c94e345c30 100644 --- a/pkgs/by-name/ke/kent/package.nix +++ b/pkgs/by-name/ke/kent/package.nix @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "kent"; - version = "492"; + version = "497"; src = fetchFromGitHub { owner = "ucscGenomeBrowser"; repo = "kent"; tag = "v${finalAttrs.version}_base"; - hash = "sha256-heeEv7zRG3DTQ1dER7f+OjeS+KHVOUq0Z7MAf7Vsw7s="; + hash = "sha256-VXm/JwudwNqZhwp7iC/BjQ/grc+9kOFn/t43ceayC4c="; }; nativeBuildInputs = [ writableTmpDirAsHomeHook ]; From b4b1ca25b06a35cd2dedb441d7f632ba77188861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Camille=20Favier?= Date: Fri, 1 May 2026 16:28:34 +0200 Subject: [PATCH 0039/1079] bcc: apply upstream patch Fixes an issue with recent kernels (6.19 and later). --- pkgs/by-name/bc/bcc/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/bc/bcc/package.nix b/pkgs/by-name/bc/bcc/package.nix index 8f1b3f9d310d..8d720a8dadb5 100644 --- a/pkgs/by-name/bc/bcc/package.nix +++ b/pkgs/by-name/bc/bcc/package.nix @@ -5,6 +5,7 @@ cmake, elfutils, fetchFromGitHub, + fetchpatch, flex, iperf, lib, @@ -43,6 +44,12 @@ python3Packages.buildPythonApplication rec { (replaceVars ./absolute-ausyscall.patch { ausyscall = lib.getExe' audit "ausyscall"; }) + + (fetchpatch { + # https://github.com/iovisor/bcc/issues/5501 + url = "https://github.com/iovisor/bcc/commit/c3f35ecca18b1ce926bd272f60f6d4465656a80b.patch"; + hash = "sha256-Fr5SqDUpQzZj8yPST0V1QExNMCSoRbOXG5ZaChDXTZQ="; + }) ]; build-system = [ python3Packages.setuptools ]; From afdf462d7e853bb2a81217dee631dcac7261eb90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 May 2026 16:54:14 +0000 Subject: [PATCH 0040/1079] kokkos: 5.1.0 -> 5.1.1 --- pkgs/by-name/ko/kokkos/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix index cdf96f2b292c..39fd218893f5 100644 --- a/pkgs/by-name/ko/kokkos/package.nix +++ b/pkgs/by-name/ko/kokkos/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kokkos"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "kokkos"; repo = "kokkos"; rev = finalAttrs.version; - hash = "sha256-yo+E8U06o7eu2U4AbXkHpo9uwjiIDE6NoP8TgUTkmuU="; + hash = "sha256-F/UNDIsEjRvM9RkTPg0wJtRdoTPpNPqyJYbgtvkntNk="; }; nativeBuildInputs = [ From 13f0bd5f924c4498e734aa501fac5baefccd1ffd Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 28 Apr 2026 09:05:24 +0200 Subject: [PATCH 0041/1079] Revert "Revert #481473 "nixos/network-interfaces: remove network-setup"" This reverts commit 85a509502df8222c6116a333a68f6748d80bb9ea. --- .../ad-hoc-network-config.section.md | 20 +- .../configuration/ipv4-config.section.md | 13 +- .../manual/release-notes/rl-2605.section.md | 7 + .../tasks/network-interfaces-scripted.nix | 313 ++++++++++-------- nixos/modules/tasks/network-interfaces.nix | 21 +- .../networking/networkd-and-scripted.nix | 47 ++- 6 files changed, 267 insertions(+), 154 deletions(-) diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.section.md b/nixos/doc/manual/configuration/ad-hoc-network-config.section.md index 7ef24825526d..611f3e3956ee 100644 --- a/nixos/doc/manual/configuration/ad-hoc-network-config.section.md +++ b/nixos/doc/manual/configuration/ad-hoc-network-config.section.md @@ -1,14 +1,24 @@ # Ad-Hoc Configuration {#ad-hoc-network-config} -You can use [](#opt-networking.localCommands) to -specify shell commands to be run at the end of `network-setup.service`. This -is useful for doing network configuration not covered by the existing NixOS -modules. For instance, to statically configure an IPv6 address: +You can use [](#opt-networking.localCommands) to specify shell commands to be +run after the network interfaces have been created, but not necessarily fully +configured. +This is useful for doing network configuration not covered by the existing +NixOS modules. For example, you can create a network namespace and a pair +of virtual ethernet devices like this: ```nix { networking.localCommands = '' - ip -6 addr add 2001:610:685:1::1/64 dev eth0 + ip netns add mynet + ip link add name veth-in type veth peer name veth-out + ip link set dev veth-out netns mynet ''; } ``` + +::: {.note} +The commands should ideally be idempotent, so it's recommended to perform +cleanups of the state you create (e.g. virtual interfaces), or at least make +sure possible failures are handled. +::: diff --git a/nixos/doc/manual/configuration/ipv4-config.section.md b/nixos/doc/manual/configuration/ipv4-config.section.md index ed0db9da8c3e..ceb9a350b680 100644 --- a/nixos/doc/manual/configuration/ipv4-config.section.md +++ b/nixos/doc/manual/configuration/ipv4-config.section.md @@ -26,9 +26,16 @@ servers: ``` ::: {.note} -Statically configured interfaces are set up by the systemd service -`interface-name-cfg.service`. The default gateway and name server -configuration is performed by `network-setup.service`. +Addresses and routes for statically configured interfaces and the default +gateway are set up by systemd services named +`network-addresses-.service`. The name servers configuration, +instead, is performed by `network-local-commands.service` using resolvconf. +::: + +::: {.note} +If needed, for example if addresses/routes were added/removed, +you can reset the network configuration by running +`systemctl restart networking-scripted.target` ::: The host name is set using [](#opt-networking.hostName): diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index a652c7a3657c..6cbc62da8950 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -300,6 +300,13 @@ See . Note for NetworkManager users: before these changes NetworkManager used to spawn its own wpa_supplicant daemon, but now it relies on `networking.wireless`. So, if you had `networking.wireless.enable = false` in your configuration, you should remove that line. +- Some implementation details of the NixOS network-interfaces module have been changed: + + - In the "scripted" backend, `network-setup.service` has been removed and the network configuration services are now part of `network.target`, which is now directly pulled into `multi-user.target`. + - Interface addresses, routes and default gateways are now configured asynchronously as soon as the underlying network devices become available (fixes issue [#154737](https://github.com/NixOS/nixpkgs/issues/154737)). + - In both "networkd" and "scripted" backends, the configuration of name servers is now part of `network-local-commands.service` (fixes issue [#445496](https://github.com/NixOS/nixpkgs/issues/445496)). + - The issue that resulted in a completely unconfigured network if both `resolvconf` was disabled and no default gateway configured, has also been fixed. + - `kratos` has been updated from 1.3.1 to [25.4.0](https://github.com/ory/kratos/releases/tag/v25.4.0). Upstream switched to a new versioning scheme (year.major.minor). Notable breaking changes: - The `migrate sql` CLI command is now `migrate sql up` diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 4b457e078e77..4bf274d4157f 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -51,6 +51,71 @@ let (lib.concatStringsSep " ") ]; + # Converts an IPv4 address literal to a list of bits + parseAddr.ipv4 = + addr: + let + pad = b: lib.replicate (8 - builtins.length b) 0 ++ b; + toBin = n: pad (lib.toBaseDigits 2 (lib.toInt n)); + in + lib.concatMap toBin (builtins.splitVersion addr); + + # Converts an IPv6 address literal to a list of bits + parseAddr.ipv6 = + addr: + let + pad = b: lib.replicate (16 - builtins.length b) 0 ++ b; + fromHex = n: (builtins.fromTOML "n = 0x${n}").n; + toBin = n: pad (lib.toBaseDigits 2 (fromHex n)); + normal = (lib.network.ipv6.fromString addr).address; + in + lib.concatMap toBin (lib.splitString ":" normal); + + # Checks if `addr` is part of the `net` subnet + inSubnet = + v: net: addr: + let + prefix = lib.take net.prefixLength (parseAddr.${v} net.address); + match = lib.zipListsWith (a: b: a == b) prefix (parseAddr.${v} addr); + in + lib.all lib.id match; + + # Checks if the netmask of all addresses on interface `iface` includes + # the IP address of `gateway` + # + # Note: this is used to check whether networking.defaultGateway relies on + # the given interface, either explicitly, via the `interface` (optional), + # or explicitly, by using an address in a subnet of this interface. + # + # Configuration of the default gateway is then performed as part of that + # interface setup in `configureAddrs`, below. + isGateway = + v: gateway: iface: + lib.any lib.id ( + [ (iface.name == gateway.interface) ] + ++ map (net: inSubnet v net gateway.address) iface.${v}.addresses + ); + + # Checks if `gateway` uses an address from `iface` as default source + # + # Note: this is needed to delay the configuration of the gateway and default + # source until the right interfaces and address have been set up, otherwise + # the commands will fail. + hasSource = + v: gateway: iface: + builtins.elem gateway.source (map (i: i.address) iface.${v}.addresses); + + # Interfaces corresponding to the default gateways + gateway4Iface = builtins.filter (isGateway "ipv4" cfg.defaultGateway) interfaces; + gateway6Iface = builtins.filter (isGateway "ipv6" cfg.defaultGateway6) interfaces; + + # Interfaces corresponding to the default source addresses + # + # Note: the use of `head` here is safe because these expressions + # are evaluated only when `needsSourceIface`, see `configureAddrs` below. + source4Iface = builtins.head (builtins.filter (hasSource "ipv4" cfg.defaultGateway) interfaces); + source6Iface = builtins.head (builtins.filter (hasSource "ipv6" cfg.defaultGateway6) interfaces); + # warn that these attributes are deprecated (2017-2-2) # Should be removed in the release after next bondDeprecation = rec { @@ -118,121 +183,71 @@ let else optional (!config.boot.isContainer) (subsystemDevice dev); - hasDefaultGatewaySet = - (cfg.defaultGateway != null && cfg.defaultGateway.address != "") - || (cfg.enableIPv6 && cfg.defaultGateway6 != null && cfg.defaultGateway6.address != ""); - - needNetworkSetup = - cfg.resolvconf.enable || cfg.defaultGateway != null || cfg.defaultGateway6 != null; - - networkLocalCommands = lib.mkIf needNetworkSetup { - after = [ "network-setup.service" ]; - bindsTo = [ "network-setup.service" ]; - }; - - networkSetup = lib.mkIf needNetworkSetup { - description = "Networking Setup"; - - after = [ "network-pre.target" ]; - before = [ - "network.target" - "shutdown.target" - ]; - wants = [ "network.target" ]; - # exclude bridges from the partOf relationship to fix container networking bug #47210 - partOf = map (i: "network-addresses-${i.name}.service") ( - filter (i: !(hasAttr i.name cfg.bridges)) interfaces - ); - conflicts = [ "shutdown.target" ]; - wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target"; - - unitConfig.ConditionCapability = "CAP_NET_ADMIN"; - - path = [ pkgs.iproute2 ]; - - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - }; - - unitConfig.DefaultDependencies = false; - - script = '' - ${optionalString config.networking.resolvconf.enable '' - # Set the static DNS configuration, if given. - ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static <, create a job ‘network-addresses-.service" - # that performs static address configuration. It has a "wants" - # dependency on ‘.service’, which is supposed to create - # the interface and need not exist (i.e. for hardware - # interfaces). It has a binds-to dependency on the actual - # network device, so it only gets started after the interface - # has appeared, and it's stopped when the interface - # disappears. + # For each interface , creates a network-addresses-.service + # job that performs static address configuration. + # + # It has a Wants dependency on -netdev.service, which creates + # create the interface, or on a device unit (for hardware interfaces). + # It also has a BindsTo dependency on the device unit: so, it only gets + # started after the interface has appeared and it's stopped when the + # interface disappears. + # + # Unless in a container, the job is not made part of network.target, so + # if an interface is not found (e.g. a USB interface not plugged in) it + # will not hang the boot sequence. + # + # If the interface is the default gateway, the job will also set the + # default gateway and delay network-online.target. configureAddrs = i: let ips = interfaceIps i; + isDefaultGateway4 = cfg.defaultGateway != null && builtins.elem i gateway4Iface; + isDefaultGateway6 = cfg.defaultGateway6 != null && builtins.elem i gateway6Iface; + needsSourceIface4 = + isDefaultGateway4 && cfg.defaultGateway.source != null && i.name != source4Iface.name; + needsSourceIface6 = + isDefaultGateway6 && cfg.defaultGateway6.source != null && i.name != source6Iface.name; + + configureGateway = + version: gateway: + optionalString (gateway.address != "") '' + echo -n "setting ${i.name} as default IPv${version} gateway... " + ${optionalString (gateway.interface != null) '' + ip -${version} route replace ${gateway.address} proto static ${ + formatIpArgs { + metric = gateway.metric; + dev = gateway.interface; + } + } + ''} + ip -${version} route replace default proto static ${ + formatIpArgs { + metric = gateway.metric; + via = gateway.address; + window = cfg.defaultGatewayWindowSize; + dev = gateway.interface; + src = gateway.source; + } + } + echo "done" + ''; in nameValuePair "network-addresses-${i.name}" { description = "Address configuration of ${i.name}"; - wantedBy = [ - "network-setup.service" - "network.target" - ]; - # order before network-setup because the routes that are configured - # there may need ip addresses configured - before = [ "network-setup.service" ]; + + wantedBy = + deviceDependency i.name + ++ optional config.boot.isContainer "network.target" + ++ optional (isDefaultGateway4 || isDefaultGateway6) "network-online.target"; bindsTo = deviceDependency i.name; - after = [ "network-pre.target" ] ++ (deviceDependency i.name); + partOf = [ "networking-scripted.target" ]; + after = [ + "network-pre.target" + ] + ++ optional needsSourceIface4 "network-addresses-${source4Iface.name}.service" + ++ optional needsSourceIface6 "network-addresses-${source6Iface.name}.service" + ++ deviceDependency i.name; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; # Restart rather than stop+start this unit to prevent the @@ -284,6 +299,10 @@ let fi '' )} + + # Set the default gateway + ${optionalString isDefaultGateway4 (configureGateway "4" cfg.defaultGateway)} + ${optionalString isDefaultGateway6 (configureGateway "6" cfg.defaultGateway6)} ''; preStop = '' state="/run/nixos/network/routes/${i.name}" @@ -311,13 +330,13 @@ let nameValuePair "${i.name}-netdev" { description = "Virtual Network Interface ${i.name}"; bindsTo = optional (!config.boot.isContainer) "dev-net-tun.device"; + partOf = [ "networking-scripted.target" ]; after = optional (!config.boot.isContainer) "dev-net-tun.device" ++ [ "network-pre.target" ]; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice i.name) ]; - before = [ "network-setup.service" ]; + before = [ "network.target" ]; path = [ pkgs.iproute2 ]; serviceConfig = { Type = "oneshot"; @@ -343,18 +362,21 @@ let description = "Bridge Interface ${n}"; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice n) ]; bindsTo = deps ++ optional v.rstp "mstpd.service"; - partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service"; + partOf = [ + "network.target" + "networking-scripted.target" + ] + ++ optional v.rstp "mstpd.service"; after = [ "network-pre.target" ] ++ deps ++ optional v.rstp "mstpd.service" ++ map (i: "network-addresses-${i}.service") v.interfaces; - before = [ "network-setup.service" ]; + before = [ "network.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute2 ]; @@ -448,15 +470,14 @@ let description = "Open vSwitch Interface ${n}"; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice n) ] ++ internalConfigs; - # before = [ "network-setup.service" ]; - # should work without internalConfigs dependencies because address/link configuration depends - # on the device, which is created by ovs-vswitchd with type=internal, but it does not... - before = [ "network-setup.service" ] ++ internalConfigs; - partOf = [ "network-setup.service" ]; # shutdown the bridge when network is shutdown + before = [ "network.target" ] ++ internalConfigs; + partOf = [ + "network.target" + "networking-scripted.target" + ]; # shutdown the bridge when network is shutdown bindsTo = [ "ovs-vswitchd.service" ]; # requires ovs-vswitchd to be alive at all times after = [ "network-pre.target" @@ -521,12 +542,12 @@ let description = "Bond Interface ${n}"; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; + partOf = [ "networking-scripted.target" ]; after = [ "network-pre.target" ] ++ deps ++ map (i: "network-addresses-${i}.service") v.interfaces; - before = [ "network-setup.service" ]; + before = [ "network.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ @@ -570,12 +591,12 @@ let description = "MACVLAN Interface ${n}"; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; + partOf = [ "networking-scripted.target" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" ]; + before = [ "network.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute2 ]; @@ -602,12 +623,12 @@ let description = "IPVLAN Interface ${n}"; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; + partOf = [ "networking-scripted.target" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" ]; + before = [ "network.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute2 ]; @@ -647,12 +668,12 @@ let description = "FOU endpoint ${n}"; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; + partOf = [ "networking-scripted.target" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" ]; + before = [ "network.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute2 ]; @@ -677,12 +698,11 @@ let description = "IPv6 in IPv4 Tunnel Interface ${n}"; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" ]; + before = [ "network.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute2 ]; @@ -720,12 +740,12 @@ let description = "IP in IP Tunnel Interface ${n}"; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; + partOf = [ "networking-scripted.target" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" ]; + before = [ "network.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute2 ]; @@ -768,12 +788,12 @@ let description = "GRE Tunnel Interface ${n}"; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; + partOf = [ "networking-scripted.target" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" ]; + before = [ "network.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute2 ]; @@ -803,13 +823,15 @@ let description = "VLAN Interface ${n}"; wantedBy = [ "network.target" - "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; - partOf = [ "network-setup.service" ]; + partOf = [ + "network.target" + "networking-scripted.target" + ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-setup.service" ]; + before = [ "network.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute2 ]; @@ -845,10 +867,27 @@ let // mapAttrs' createGreDevice cfg.greTunnels // mapAttrs' createVlanDevice cfg.vlans // { - network-setup = networkSetup; - network-local-commands = networkLocalCommands; + network-local-commands = { + after = [ "network-pre.target" ]; + wantedBy = [ "network.target" ]; + }; }; + # Note: the scripted networking backend consistent of many + # independent services that are linked to the network.target. + # Since there is no daemon (e.g systemd-networkd) that is + # started as part of the system and pulls in network.target. + # Thus, to start these services we link network.target directly + # to multi-user.target, this has the same result. + systemd.targets.network.wantedBy = [ "multi-user.target" ]; + + # This target serves no purpose during the boot, but can be + # used to quickly reset the network configuration by running + # systemctl restart networking-scripted.target + systemd.targets.networking-scripted = { + description = "NixOS scripted networking setup"; + }; + services.udev.extraRules = '' KERNEL=="tun", TAG+="systemd" ''; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 2b01843b82dc..4887256b7be1 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -747,10 +747,9 @@ in default = ""; example = "text=anything; echo You can put $text here."; description = '' - Shell commands to be executed at the end of the - `network-setup` systemd service. Note that if - you are using DHCP to obtain the network configuration, - interfaces may not be fully configured yet. + Shell commands to be executed after all the network + interfaces have been created, but not necessarily + fully configured. ''; }; @@ -1853,6 +1852,20 @@ in ''; }; }; + + networking.localCommands = lib.mkIf config.networking.resolvconf.enable '' + # Set the static DNS configuration, if given. + ${pkgs.openresolv}/sbin/resolvconf -m 1 -a static < Date: Fri, 1 May 2026 16:30:48 +0200 Subject: [PATCH 0042/1079] nixos/networking-interfaces-scripted: add fix for systemd initrd When systemd is used in stage 1 (boot.initrd.systemd.enable), the device units are activated before the stage 2 units are loaded, so the network-addresses-*.service are never started. To avoid this, in addition to the wantedBy dependency, we use udev rules with SYSTEMD_WANTS to trigger the services directly. --- .../modules/tasks/network-interfaces-scripted.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 4bf274d4157f..7961cb21ff5a 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -888,9 +888,18 @@ let description = "NixOS scripted networking setup"; }; - services.udev.extraRules = '' - KERNEL=="tun", TAG+="systemd" - ''; + services.udev.extraRules = lib.concatStringsSep "\n" ( + [ ''KERNEL=="tun", TAG+="systemd"'' ] + # This creates a udev rule to start each service with a WantedBy + # dependency on a device unit. It's needed because if the service + # unit is loaded in stage 2 but its device was already up by + # stage 1, systemd will not automatically start it. + ++ lib.forEach (lib.attrNames cfg.interfaces) ( + iface: + ''ACTION=="add", SUBSYSTEM=="net", KERNEL=="${iface}", '' + + ''ENV{SYSTEMD_WANTS}="network-addresses-${iface}.service"'' + ) + ); }; From 49b3bfe001859d85e4722d14805aa27db1177f92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 May 2026 22:12:23 +0000 Subject: [PATCH 0043/1079] python3Packages.qiskit: 2.3.1 -> 2.4.1 --- pkgs/development/python-modules/qiskit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 1ab91eaa020c..384efdcfd8d9 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "qiskit"; - version = "2.3.1"; + version = "2.4.1"; pyproject = true; src = fetchFromGitHub { owner = "Qiskit"; repo = "qiskit"; tag = version; - hash = "sha256-7/7MjwA3XJ65Ylw0WljS8PQSwGJ6g8towTqn17qKBxw="; + hash = "sha256-Y5JgapafP3lxR7PMNB7+yDoM6vFvSoMZMrpOE2jeemU="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-/h5eCaZzGlXeoBp8+VvCrXF1RySjAKRP/QZjuB23ivU="; + hash = "sha256-skyZSoYO9XiwQGkgSxRCB3N0+XgDMM5IM9o6KfSG35k="; }; dependencies = [ From ff26205d89f90feea321dfb94395c8b6d6cfb1fe Mon Sep 17 00:00:00 2001 From: Eduardo Maia Date: Fri, 24 Apr 2026 18:13:09 -0300 Subject: [PATCH 0044/1079] iterm2: fix download URL extraction in update script --- pkgs/by-name/it/iterm2/update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/it/iterm2/update.sh b/pkgs/by-name/it/iterm2/update.sh index 8a36786c47f4..8533f87ee047 100755 --- a/pkgs/by-name/it/iterm2/update.sh +++ b/pkgs/by-name/it/iterm2/update.sh @@ -4,12 +4,12 @@ set -eu -o pipefail currentVersion=$(nix-instantiate --eval -E "with import ./. {}; iterm2.version or (lib.getVersion iterm2)" | tr -d '"') -downloadUrl=$( +downloadUrls=$( curl -sL "https://iterm2.com/downloads.html" | grep -o -E 'href="[^"]*iTerm2[^"]*\.zip"' | - sed 's/href="//;s/"//' | - head -1 + sed 's/href="//;s/"//' ) +downloadUrl=$(echo "$downloadUrls" | head -1) if [[ -z "$downloadUrl" ]]; then echo >&2 "Failed to extract download url from iTerm2 downloads page" From 90a2d70abe2d07121f9f95bc2a93163423e3fe89 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 2 May 2026 12:57:38 +0200 Subject: [PATCH 0045/1079] nixos/lib/make-multi-disk-zfs-image: use structuredAttrs instead of passAsFile --- nixos/lib/make-multi-disk-zfs-image.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix index 69d05ab004f6..dd49009450a0 100644 --- a/nixos/lib/make-multi-disk-zfs-image.nix +++ b/nixos/lib/make-multi-disk-zfs-image.nix @@ -221,12 +221,12 @@ let }; }) mountable; }; - passAsFile = [ "filesystems" ]; + __structuredAttrs = true; } '' ( echo "builtins.fromJSON '''" - jq . < "$filesystemsPath" + printf "%s" "$filesystems" | jq . echo "'''" ) > $out From 340a2d696982f4196fc2ef3c97354870a29ba18f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 2 May 2026 12:57:40 +0200 Subject: [PATCH 0046/1079] nixos/lib/make-single-disk-zfs-image: use structuredAttrs instead of passAsFile --- nixos/lib/make-single-disk-zfs-image.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix index 7e47be6d00d9..8c71fbd2c13d 100644 --- a/nixos/lib/make-single-disk-zfs-image.nix +++ b/nixos/lib/make-single-disk-zfs-image.nix @@ -209,12 +209,12 @@ let }; }) mountable; }; - passAsFile = [ "filesystems" ]; + __structuredAttrs = true; } '' ( echo "builtins.fromJSON '''" - jq . < "$filesystemsPath" + printf "%s" "$filesystems" | jq . echo "'''" ) > $out From 9897c149b65a037b1a231b16ae8170d381ee186b Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sun, 3 May 2026 00:17:12 +0200 Subject: [PATCH 0047/1079] laszip: 3.4.4 -> 3.5.0 changelog: https://github.com/LASzip/LASzip/releases/tag/3.5.0 diff: https://github.com/LASzip/LASzip/compare/3.4.4...3.5.0 --- pkgs/by-name/la/laszip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/laszip/package.nix b/pkgs/by-name/la/laszip/package.nix index 9051a6d15750..19b43ec24e4d 100644 --- a/pkgs/by-name/la/laszip/package.nix +++ b/pkgs/by-name/la/laszip/package.nix @@ -7,14 +7,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "3.4.4"; + version = "3.5.0"; pname = "laszip"; src = fetchFromGitHub { owner = "LASzip"; repo = "LASzip"; tag = finalAttrs.version; - hash = "sha256-v/oLU69zqDW1o1HTlay7GDh1Kbmv1rarII2Fz5HWCqg="; + hash = "sha256-xZ8IFnqrGt47lN+C6/ibgbIWqpObDf4RHPaGMXw0WZ4="; }; hardeningDisable = [ "format" ]; # -Werror=format-security From 8c6746131dd85e15863d86f320cc4e61756630b6 Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Sun, 3 May 2026 00:18:08 +0200 Subject: [PATCH 0048/1079] laszip: add hythera as maintainer --- pkgs/by-name/la/laszip/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/la/laszip/package.nix b/pkgs/by-name/la/laszip/package.nix index 19b43ec24e4d..18d1351e6063 100644 --- a/pkgs/by-name/la/laszip/package.nix +++ b/pkgs/by-name/la/laszip/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://laszip.org"; changelog = "https://github.com/LASzip/LASzip/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.lgpl2; - maintainers = [ ]; + maintainers = with lib.maintainers; [ hythera ]; platforms = lib.platforms.unix; }; }) From b8c21e8c64c130eba68ee7371f250417126e8d2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 May 2026 00:56:15 +0000 Subject: [PATCH 0049/1079] snd: 26.2 -> 26.3 --- pkgs/by-name/sn/snd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix index a6ee70daff6d..8335f4cff55a 100644 --- a/pkgs/by-name/sn/snd/package.nix +++ b/pkgs/by-name/sn/snd/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "snd"; - version = "26.2"; + version = "26.3"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${finalAttrs.version}.tar.gz"; - hash = "sha256-niNk7SrAt069dzaMsbWxnxd5hNlN9xV2lgc1WgCRmcc="; + hash = "sha256-QKXyNUX2UuVWXJRXZCkwmIysZg5tKPAShTnZTGUdp7Q="; }; nativeBuildInputs = [ From 1b1895e3d46970b9b759f7f0450abdcac381e937 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 May 2026 01:04:36 +0000 Subject: [PATCH 0050/1079] vscode-extensions.dart-code.flutter: 3.132.0 -> 3.134.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2fd4eca2ca34..ff556565f39f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1215,8 +1215,8 @@ let mktplcRef = { name = "flutter"; publisher = "dart-code"; - version = "3.132.0"; - hash = "sha256-2R9SwNaJBKv39JLRy0IFm6/0J8Izj2DlEAat+yigIFk="; + version = "3.134.0"; + hash = "sha256-wWANxBh9Tg3VkfbcrR0NgOIC8cpeZJCNfOevT7E4zKY="; }; meta.license = lib.licenses.mit; From 67bf3bcc1ad15029ebedf0988461b6a162da0b0e Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Sun, 3 May 2026 04:47:14 +0000 Subject: [PATCH 0051/1079] cjdns: 22.1 -> 22.3 --- pkgs/by-name/cj/cjdns/package.nix | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix index e30db3812057..e9e8f81cae95 100644 --- a/pkgs/by-name/cj/cjdns/package.nix +++ b/pkgs/by-name/cj/cjdns/package.nix @@ -15,36 +15,22 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cjdns"; - version = "22.1"; + version = "22.3"; src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; tag = "cjdns-v${finalAttrs.version}"; - hash = "sha256-0imQrkcvIA+2Eq/zlC65USMR7T3OUKwQxrB1KtVexyU="; + hash = "sha256-A5KPcjFrCIYhT/6W+J4Nvb1y23cAgv9M6PWcyN43st4="; }; patches = [ (replaceVars ./system-libsodium.patch { libsodium_include_dir = "${libsodium.dev}/include"; }) - # Remove mkpasswd since it is failing the build - (fetchpatch { - url = "https://github.com/cjdelisle/cjdns/commit/6391dba3f5fdab45df4b4b6b71dbe9620286ce32.patch"; - hash = "sha256-XVA4tdTVMLrV6zuGoBCkOgQq6NXh0x7u8HgmaxFeoRI="; - }) - (fetchpatch { - url = "https://github.com/cjdelisle/cjdns/commit/436d9a9784bae85734992c2561c778fbd2f5ac32.patch"; - hash = "sha256-THcYNGVbMx/xf3/5UIxEhz3OlODE0qiYgDBOlHunhj8="; - }) - # Fix build failure with Rust 1.89.0 (https://github.com/cjdelisle/cjdns/pull/1271) - (fetchpatch { - url = "https://github.com/cjdelisle/cjdns/commit/68b786aca5bfa427e5f58c029e4d9cc74969ef87.patch"; - hash = "sha256-FmrooDzrIWUIAnzwZTVDXI+Cl8pMngPqxsJjUHVhry8="; - }) ]; - cargoHash = "sha256-f96y6ZW0HxC+73ts5re8GIo2aigQgK3gXyF7fMrcJ0o="; + cargoHash = "sha256-tob45/99svE0R1Kk7G1+H7waBWYmI9VKC8ffl3ZmdcU="; nativeBuildInputs = [ which From e5b091cee35b09cb2b789cdae379bdd90aa8efa5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 May 2026 07:45:53 +0000 Subject: [PATCH 0052/1079] python3Packages.typeshed-client: 2.8.2 -> 2.11.0 --- pkgs/development/python-modules/typeshed-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix index e230969c53d7..3dfe797b072f 100644 --- a/pkgs/development/python-modules/typeshed-client/default.nix +++ b/pkgs/development/python-modules/typeshed-client/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "typeshed-client"; - version = "2.8.2"; + version = "2.11.0"; pyproject = true; src = fetchFromGitHub { owner = "JelleZijlstra"; repo = "typeshed_client"; tag = "v${version}"; - hash = "sha256-+muWm2/Psp8V1n7mEloc+ltuwHG/uRvDUgSFRNzz5EQ="; + hash = "sha256-hSyhGn+xEUjZVrYUYaxZ/3CwNXy4EJ2TG73S9o3o0gw="; }; build-system = [ setuptools ]; From 4f3c3a4f085720de9f99d33acf7bf9cdd62ab15c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 May 2026 09:34:49 +0000 Subject: [PATCH 0053/1079] minizinc-ide: 2.9.5 -> 2.9.7 --- pkgs/by-name/mi/minizinc-ide/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/minizinc-ide/package.nix b/pkgs/by-name/mi/minizinc-ide/package.nix index 760fab209312..16ebce5c675b 100644 --- a/pkgs/by-name/mi/minizinc-ide/package.nix +++ b/pkgs/by-name/mi/minizinc-ide/package.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "minizinc-ide"; - version = "2.9.5"; + version = "2.9.7"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "MiniZincIDE"; rev = finalAttrs.version; - hash = "sha256-VqVcByPBS7UBU/h5NIUltIKA0POAX1dUVgMsn5b9C4w="; + hash = "sha256-uOWV+mMIczszFg4BuLADRKoOeTQEYecwMKFwH6v6zl8="; fetchSubmodules = true; }; From 927c5b72f13a78d9f1dc4cfd60b5fa771a69a1c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20Tich=C3=BD?= Date: Sun, 3 May 2026 18:53:46 +0200 Subject: [PATCH 0054/1079] openttd-jgrpp: 0.69.2 -> 0.72.0 --- pkgs/by-name/op/openttd-jgrpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openttd-jgrpp/package.nix b/pkgs/by-name/op/openttd-jgrpp/package.nix index 4d0794d4d7d9..7bae65bcdbc1 100644 --- a/pkgs/by-name/op/openttd-jgrpp/package.nix +++ b/pkgs/by-name/op/openttd-jgrpp/package.nix @@ -6,13 +6,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.69.2"; + version = "0.72.0"; src = fetchFromGitHub { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-D9Oh05Isf7Atsih6tZBA8xS04aCuE8VS5Ghf0FvrU5A="; + hash = "sha256-bja6SiXnA4hdM/h6dyTMxmuII+waHm3iW3AjP0C3dnU="; }; patches = [ ]; From 58bd622688e74b239cd6a152d20e438a0073c94f Mon Sep 17 00:00:00 2001 From: teto <886074+teto@users.noreply.github.com> Date: Sun, 3 May 2026 21:12:25 +0200 Subject: [PATCH 0055/1079] luaPackages.mega-logging: init at 1.1.6 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 30e305795d40..353a6c279e98 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -123,6 +123,7 @@ magick,,,,,5.1,donovanglover markdown,,,,,, md5,,,,,, mediator_lua,,,,,, +mega.logging,,,,,, middleclass,,,,,, mimetypes,,,,,, mini.test,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 304cac321285..a96c12456764 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -4477,6 +4477,33 @@ final: prev: { } ) { }; + mega-logging = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + }: + buildLuarocksPackage { + pname = "mega.logging"; + version = "1.1.6-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/mega.logging-1.1.6-1.rockspec"; + sha256 = "1va6vl4iqnc3ip2ws1ff65xavw1m6wgdrsal1gvqnjn0gh20vxbg"; + }).outPath; + src = fetchzip { + url = "https://github.com/ColinKennedy/mega.logging/archive/v1.1.6.zip"; + sha256 = "0sy7f42rbdanz9bi0kq6vzllykqcrp04bp7b5k3cqpml5ckywpl5"; + }; + + meta = { + homepage = "https://github.com/ColinKennedy/mega.logging"; + license.fullName = "MIT"; + description = "A Neovim plugin for logging to Neovim or to disk"; + }; + } + ) { }; + middleclass = callPackage ( { buildLuarocksPackage, From 37d80aeaeebaf644fdccbdc90cecb9b5ee2293ef Mon Sep 17 00:00:00 2001 From: teto <886074+teto@users.noreply.github.com> Date: Sun, 3 May 2026 21:12:25 +0200 Subject: [PATCH 0056/1079] luaPackages.mega-cmdparse: init at 1.2.1 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 353a6c279e98..4488219ecf07 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -123,6 +123,7 @@ magick,,,,,5.1,donovanglover markdown,,,,,, md5,,,,,, mediator_lua,,,,,, +mega.cmdparse,,,,,, mega.logging,,,,,, middleclass,,,,,, mimetypes,,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index a96c12456764..ee057d7ddce9 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -4477,6 +4477,36 @@ final: prev: { } ) { }; + mega-cmdparse = callPackage ( + { + buildLuarocksPackage, + fetchurl, + fetchzip, + mega-logging, + }: + buildLuarocksPackage { + pname = "mega.cmdparse"; + version = "1.2.1-1"; + knownRockspec = + (fetchurl { + url = "mirror://luarocks/mega.cmdparse-1.2.1-1.rockspec"; + sha256 = "1766pqazkr3zfwaaj541m53y90n5zr0r7068hd67d9hgvd7za6sb"; + }).outPath; + src = fetchzip { + url = "https://github.com/ColinKennedy/mega.cmdparse/archive/v1.2.1.zip"; + sha256 = "1bf3rf80m65jc51dlv3vcs2jhzk5ni2kr7v5rsmb31k7wk3002qb"; + }; + + propagatedBuildInputs = [ mega-logging ]; + + meta = { + homepage = "https://github.com/ColinKennedy/mega.cmdparse"; + license.fullName = "MIT"; + description = "A Neovim command-mode parser. Similar to Python's argparse module"; + }; + } + ) { }; + mega-logging = callPackage ( { buildLuarocksPackage, From 61feedfa7d3fb10491bbfac0f418eed46465ed31 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sun, 3 May 2026 12:56:42 -0700 Subject: [PATCH 0057/1079] ophcrack: fix build --- pkgs/by-name/op/ophcrack/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix index 9ae150020b8c..4a6c6b79ccd6 100644 --- a/pkgs/by-name/op/ophcrack/package.nix +++ b/pkgs/by-name/op/ophcrack/package.nix @@ -33,9 +33,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook; buildInputs = [ openssl + expat ] - ++ (if enableGui then [ libsForQt5.qtcharts ] else [ expat ]) - ++ lib.optional stdenv.hostPlatform.isDarwin expat; + ++ lib.optional enableGui libsForQt5.qtcharts; configureFlags = [ "--with-libssl" @@ -50,11 +50,6 @@ stdenv.mkDerivation (finalAttrs: { [ "--disable-gui" ] ); - installPhase = lib.optional stdenv.hostPlatform.isDarwin '' - mkdir -p $out/bin - cp -R src/ophcrack $out/bin - ''; - meta = { description = "Free Windows password cracker based on rainbow tables"; homepage = "https://ophcrack.sourceforge.io"; From 9a0bec4b8860f4740dd5440e4d7730593eea0536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20Tich=C3=BD?= Date: Sun, 3 May 2026 22:46:28 +0200 Subject: [PATCH 0058/1079] maintainers: add artifycz --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b771a590c9dd..b5241a5133eb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2323,6 +2323,13 @@ githubId = 14922630; name = "Richard Smith"; }; + artifycz = { + email = "richard@tichy.io"; + github = "ArtifyCZ"; + githubId = 57506608; + matrix = "@artify:artify.zone"; + name = "Richard Tichy"; + }; artturin = { email = "artturin@artturin.com"; matrix = "@artturin:matrix.org"; From da2f37970281cf2eee19d55ca9d7468865a1667d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Richard=20Tich=C3=BD?= Date: Sun, 3 May 2026 23:01:47 +0200 Subject: [PATCH 0059/1079] openttd-jgrpp: add artifycz as maintainer --- pkgs/by-name/op/openttd-jgrpp/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/op/openttd-jgrpp/package.nix b/pkgs/by-name/op/openttd-jgrpp/package.nix index 7bae65bcdbc1..6cb0ad949e16 100644 --- a/pkgs/by-name/op/openttd-jgrpp/package.nix +++ b/pkgs/by-name/op/openttd-jgrpp/package.nix @@ -1,4 +1,5 @@ { + lib, fetchFromGitHub, openttd, zstd, @@ -22,6 +23,7 @@ openttd.overrideAttrs (oldAttrs: rec { homepage = "https://github.com/JGRennison/OpenTTD-patches"; changelog = "https://github.com/JGRennison/OpenTTD-patches/blob/jgrpp-${version}/jgrpp-changelog.md"; mainProgram = "openttd"; + maintainers = with lib.maintainers; [ artifycz ]; }; }) From 3b2802441fc789bc664e5171ff31c902070a4bb5 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Sun, 3 May 2026 16:27:58 -0700 Subject: [PATCH 0060/1079] envision{,-unwrapped}: mark as broken, remove pandapip1 and add coolGi as maintainer --- pkgs/by-name/en/envision-unwrapped/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index 8f77829a7ea9..a52e647349d6 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { + broken = true; description = "UI for building, configuring and running Monado, the open source OpenXR runtime"; homepage = "https://gitlab.com/gabmus/envision"; license = lib.licenses.agpl3Only; @@ -110,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { # envision (wrapped) requires frequent updates to the dependency list; # the more people that can help with this, the better. maintainers = with lib.maintainers; [ - pandapip1 + coolGi Scrumplex txkyel ]; From 3d38296a2f7a43bd61c80b4a044ef854a1813d98 Mon Sep 17 00:00:00 2001 From: Marcel Date: Sun, 3 May 2026 23:44:54 +0200 Subject: [PATCH 0061/1079] nixos/motioneye: use ffmpeg-headless --- nixos/modules/services/video/motioneye.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/video/motioneye.nix b/nixos/modules/services/video/motioneye.nix index 0dc5ad21bf54..6a8c2a01cf1a 100644 --- a/nixos/modules/services/video/motioneye.nix +++ b/nixos/modules/services/video/motioneye.nix @@ -15,7 +15,7 @@ in packages = { motioneye = lib.mkPackageOption pkgs "motioneye" { }; motion = lib.mkPackageOption pkgs "motion" { }; - ffmpeg = lib.mkPackageOption pkgs "ffmpeg" { }; + ffmpeg = lib.mkPackageOption pkgs "ffmpeg-headless" { }; }; user = lib.mkOption { From 63e5d6b5d3af307f86a8aeaa90d207976b6d70cf Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sun, 3 May 2026 17:35:11 -0700 Subject: [PATCH 0062/1079] petidomo: fix build with gcc15 --- pkgs/by-name/pe/petidomo/fix-gcc15.patch | 68 ++++++++++++++++++++++++ pkgs/by-name/pe/petidomo/package.nix | 7 ++- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/pe/petidomo/fix-gcc15.patch diff --git a/pkgs/by-name/pe/petidomo/fix-gcc15.patch b/pkgs/by-name/pe/petidomo/fix-gcc15.patch new file mode 100644 index 000000000000..6a35ac0b9985 --- /dev/null +++ b/pkgs/by-name/pe/petidomo/fix-gcc15.patch @@ -0,0 +1,68 @@ +diff --git a/liblists/lists.h b/liblists/lists.h +index 6643552..982c8bc 100644 +--- a/liblists/lists.h ++++ b/liblists/lists.h +@@ -32,7 +32,7 @@ + #ifndef __cplusplus + #ifndef PETIDOMO_HAS_DEFINED_BOOL + # define PETIDOMO_HAS_DEFINED_BOOL 1 +-typedef int bool; ++#include + #endif + #ifndef FALSE + # define FALSE (0==1) +diff --git a/libtext/text.h b/libtext/text.h +index a258c79..1fd5274 100644 +--- a/libtext/text.h ++++ b/libtext/text.h +@@ -36,7 +36,7 @@ extern "C" { + #ifndef __cplusplus + #ifndef PETIDOMO_HAS_DEFINED_BOOL + # define PETIDOMO_HAS_DEFINED_BOOL 1 +-typedef int bool; ++#include + #endif + + #ifndef FALSE +diff --git a/petidomo.h b/petidomo.h +index d503de0..a0c1308 100644 +--- a/petidomo.h ++++ b/petidomo.h +@@ -26,7 +26,7 @@ + + #ifndef PETIDOMO_HAS_DEFINED_BOOL + # define PETIDOMO_HAS_DEFINED_BOOL 1 +- typedef int bool; ++#include + #endif + + #ifndef DEBUG_DMALLOC +@@ -135,7 +135,7 @@ struct Mail + }; + + void RemoveCarrigeReturns(char *buffer); +-int isRFC822Address(const char *buffer); ++bool isRFC822Address(const char *buffer); + int ParseAddressLine(char *buffer); + int ParseReplyToLine(char *buffer); + int ParseFromLine(char *buffer); +@@ -157,8 +157,8 @@ int ArchiveMail(const struct Mail *MailStruct, const char *listname); + /********** authen.c **********/ + + int FindBodyPassword(struct Mail *MailStruct); +-int isValidAdminPassword(const char *password, const char *listname); +-int isValidPostingPassword(const char *password, const char *listname); ++bool isValidAdminPassword(const char *password, const char *listname); ++bool isValidPostingPassword(const char *password, const char *listname); + + /********** filter.c **********/ + +@@ -226,7 +226,7 @@ const char *getPassword(void ); + /********** tool.c **********/ + + char *buildFuzzyMatchAddress(const char *); +-int isValidListName(const char *); ++bool isValidListName(const char *); + bool isSubscribed(const char *, const char *, char **, char **, bool); + + /********** unsubscribe.c **********/ diff --git a/pkgs/by-name/pe/petidomo/package.nix b/pkgs/by-name/pe/petidomo/package.nix index f277e5e3dfbd..bb66483f5d96 100644 --- a/pkgs/by-name/pe/petidomo/package.nix +++ b/pkgs/by-name/pe/petidomo/package.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ddNw0fq2MQLJd6YCmIkf9lvq9/Xscl94Ds8xR1hfjXQ="; }; + patches = [ + # https://github.com/peti/petidomo/pull/1 + ./fix-gcc15.patch + ]; + buildInputs = [ flex bison @@ -38,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://petidomo.sourceforge.net/"; description = "Simple and easy to administer mailing list server"; license = lib.licenses.gpl3Plus; - + mainProgram = "petidomo"; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.peti ]; }; From e2c3d18728720070af61e569a88181193f568c14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 May 2026 03:02:20 +0000 Subject: [PATCH 0063/1079] thc-hydra: 9.6 -> 9.7 --- pkgs/by-name/th/thc-hydra/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/thc-hydra/package.nix b/pkgs/by-name/th/thc-hydra/package.nix index db87bf2d2597..4e8abd6bb1ba 100644 --- a/pkgs/by-name/th/thc-hydra/package.nix +++ b/pkgs/by-name/th/thc-hydra/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "thc-hydra"; - version = "9.6"; + version = "9.7"; src = fetchFromGitHub { owner = "vanhauser-thc"; repo = "thc-hydra"; rev = "v${version}"; - sha256 = "sha256-DS3Fh4a6OtqZRHubgJewB7qnJXm10sYv85R6o/NePoU="; + sha256 = "sha256-6YNHy9k/NJkZYj0TjciPMOXMq/McGQnmj7HWk6KbgI4="; }; postPatch = From 81f37d7aec6ba3802ddf14382dce106600f66081 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 May 2026 04:51:03 +0000 Subject: [PATCH 0064/1079] vscode-extensions.dart-code.dart-code: 3.132.0 -> 3.134.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2fd4eca2ca34..5aecba8a98ea 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1204,8 +1204,8 @@ let mktplcRef = { name = "dart-code"; publisher = "dart-code"; - version = "3.132.0"; - hash = "sha256-AWzHCg6N//+RmQ1I3Qq4c8Kk+e3gZpeqK9yWB8kfl6w="; + version = "3.134.0"; + hash = "sha256-/tWH2uGfOuyvF8mfga2YdGK1ok2UYQchaOeCC2n+IHk="; }; meta.license = lib.licenses.mit; From 805911be4e5e7fe4fb182b30a20e3745f42d2325 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 May 2026 06:08:06 +0000 Subject: [PATCH 0065/1079] vscode-extensions.tuttieee.emacs-mcx: 0.110.7 -> 0.110.9 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2fd4eca2ca34..aba014454b1f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4807,8 +4807,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.110.7"; - hash = "sha256-9w78/6W/aqJxzoTBqSV7sek2zUf9gKlWFJ/0/XS9124="; + version = "0.110.9"; + hash = "sha256-xHu8GvBoZKMag7BdHddXyjm2IReMujs9cggOn4h32t8="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; From 2069340b1f47a88b973113e14eb5be9c6524f357 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 May 2026 06:15:09 +0000 Subject: [PATCH 0066/1079] frescobaldi: 4.0.4 -> 4.0.6 --- pkgs/by-name/fr/frescobaldi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/frescobaldi/package.nix b/pkgs/by-name/fr/frescobaldi/package.nix index 4f8cbd308c0a..e0c0cbaa91b9 100644 --- a/pkgs/by-name/fr/frescobaldi/package.nix +++ b/pkgs/by-name/fr/frescobaldi/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication rec { pname = "frescobaldi"; - version = "4.0.4"; + version = "4.0.6"; pyproject = true; src = fetchFromGitHub { owner = "wbsoft"; repo = "frescobaldi"; tag = "v${version}"; - hash = "sha256-J0QC+VwNdA24vAW5Fx+cz5IFajkB8GmR4Rae0Q+2zw8="; + hash = "sha256-IgvjKj0+8oNbuZ91n4O16kGXBS7rS63HQUNQnJcOis8="; }; dependencies = with python3Packages; [ From 52417df974f604fb09ab6b4572cf87b8be07e15c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 May 2026 10:45:40 +0000 Subject: [PATCH 0067/1079] vscode-extensions.coder.coder-remote: 1.14.3 -> 1.14.5 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2fd4eca2ca34..4b38dfeacf0a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1007,8 +1007,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.14.3"; - hash = "sha256-W4VciZMvVtRcCibJP5UGTlHCrdF/AF167xlLvZs5BB4="; + version = "1.14.5"; + hash = "sha256-08GsGOtgLhq5vLpQ9VDdVk/q5VSW6d7cXXflNQOpB50="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; From e93563e6a8bc0130c9122cf07406fafa96c7bafb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 4 May 2026 13:13:04 +0200 Subject: [PATCH 0068/1079] python3Packages.pyramid-beaker: set license source: https://github.com/Pylons/pyramid_beaker/blob/master/LICENSE.txt --- pkgs/development/python-modules/pyramid-beaker/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyramid-beaker/default.nix b/pkgs/development/python-modules/pyramid-beaker/default.nix index 4bec91496e21..bb3c620a27fc 100644 --- a/pkgs/development/python-modules/pyramid-beaker/default.nix +++ b/pkgs/development/python-modules/pyramid-beaker/default.nix @@ -33,8 +33,7 @@ buildPythonPackage rec { meta = { description = "Beaker session factory backend for Pyramid"; homepage = "https://docs.pylonsproject.org/projects/pyramid_beaker/en/latest/"; - # idk, see https://github.com/Pylons/pyramid_beaker/blob/master/LICENSE.txt - # license = licenses.mpl20; + license = lib.licenses.bsd3Modification; maintainers = [ ]; }; } From 98572815b5b6c5a7786c6673b8e8d7c5f6294a52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 May 2026 12:15:18 +0000 Subject: [PATCH 0069/1079] novelwriter: 2.8.2 -> 26.1 --- pkgs/by-name/no/novelwriter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/novelwriter/package.nix b/pkgs/by-name/no/novelwriter/package.nix index 2db23a8950b9..bfa500012e6a 100644 --- a/pkgs/by-name/no/novelwriter/package.nix +++ b/pkgs/by-name/no/novelwriter/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "2.8.2"; + version = "26.1"; in python3.pkgs.buildPythonApplication { pname = "novelwriter"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication { owner = "vkbo"; repo = "novelWriter"; tag = "v${version}"; - hash = "sha256-VCl0dHnMlmkyGFeLPACi2ZC66ebrDraw+JABNomWP4k="; + hash = "sha256-vvJTEfqkxnh7TWnqBtT39nVyVTVQyAKVI6fDjOiiuPk="; }; nativeBuildInputs = [ qt6.wrapQtAppsHook ]; From beab2cf395e54b6085768ef13c91b39852e029fa Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 4 May 2026 14:36:14 +0200 Subject: [PATCH 0070/1079] python3Packages.recursive-pth-loader: set license This code is part of nixpkgs so it should be under `MIT` --- .../python-modules/recursive-pth-loader/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index c5a21d488fcf..b379c6bfbc6e 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -1,4 +1,8 @@ -{ stdenv, python }: +{ + lib, + stdenv, + python, +}: stdenv.mkDerivation { pname = "python-recursive-pth-loader"; @@ -20,5 +24,6 @@ stdenv.mkDerivation { meta = { description = "Enable recursive processing of pth files anywhere in sys.path"; + license = lib.licenses.mit; }; } From 816dadc58cd2ffedd868cc84f5a6a6ad613cf255 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 4 May 2026 14:47:47 +0200 Subject: [PATCH 0071/1079] python3Packages.unicodecsv: set license source: https://github.com/jdunck/python-unicodecsv/blob/master/LICENSE --- pkgs/development/python-modules/unicodecsv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix index e5e6578e607a..d17af2994b96 100644 --- a/pkgs/development/python-modules/unicodecsv/default.nix +++ b/pkgs/development/python-modules/unicodecsv/default.nix @@ -21,5 +21,6 @@ buildPythonPackage rec { description = "Drop-in replacement for Python2's stdlib csv module, with unicode support"; homepage = "https://github.com/jdunck/python-unicodecsv"; maintainers = with lib.maintainers; [ koral ]; + license = lib.licenses.bsd2WithViews; }; } From d887cb9758b6fbc43d2217202be3474933a5921c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 4 May 2026 16:10:50 +0200 Subject: [PATCH 0072/1079] ocamlPackages.reason-native.src: set license source: https://github.com/reasonml/reason-native/blob/master/LICENSE --- pkgs/development/ocaml-modules/reason-native/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/ocaml-modules/reason-native/default.nix b/pkgs/development/ocaml-modules/reason-native/default.nix index 46df185ce87c..fbffaab4ae9a 100644 --- a/pkgs/development/ocaml-modules/reason-native/default.nix +++ b/pkgs/development/ocaml-modules/reason-native/default.nix @@ -29,6 +29,9 @@ lib.makeScope newScope (self: { # When updating this make sure to also update the `version` above rev = "20b1997b6451d9715dfdbeec86a9d274c7430ed8"; hash = "sha256-96Ucq70eSy6pqh5ne9xoODWe/nPuriZnFAdx0OkLVCs="; + meta = { + license = lib.licenses.mit; + }; }; cli = self.callPackage ./cli.nix { }; From 7be34c16424684ce7bb65b4bca33096e0ba82055 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 May 2026 16:04:43 +0000 Subject: [PATCH 0073/1079] dolt: 1.86.2 -> 1.86.6 --- pkgs/by-name/do/dolt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index e1115895beec..0601eaa2e9c2 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "dolt"; - version = "1.86.2"; + version = "1.86.6"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; tag = "v${finalAttrs.version}"; - hash = "sha256-CXhdt9uIhdSEW3M21pL2WeT+zKPUxyYrU4fGTgMgun4="; + hash = "sha256-OVoREOeVTuRMot6nfpxAfnxRFcTLpZWsIRcg/yk/rMg="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-JdpPKao8LOGzKzzLtfiYh3rUn1OLLcA7YIrztHwTLmU="; + vendorHash = "sha256-8Ls+ANNiE1yBgZuAnDp+FcU4rCiWwSKGo2jTjXVbWFo="; proxyVendor = true; doCheck = false; From b8ab8e2023221d0750c8a67a5afc19749357a328 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 May 2026 02:11:24 +0000 Subject: [PATCH 0074/1079] kn: 1.20.0 -> 1.22.0 --- pkgs/by-name/kn/kn/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kn/kn/package.nix b/pkgs/by-name/kn/kn/package.nix index b1b4ea590546..8e683a1220b5 100644 --- a/pkgs/by-name/kn/kn/package.nix +++ b/pkgs/by-name/kn/kn/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "kn"; - version = "1.20.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; tag = "knative-v${finalAttrs.version}"; - hash = "sha256-rElNlb3NfbOZjCMWT2efknWM9B0+BFa5CCNmcA6afPY="; + hash = "sha256-G5kadNskSwKBxSuvs58aJUM7+lraevk2GKH/sncslTo="; }; - vendorHash = "sha256-rZEkwiCy2kpeKOi4lhLoW1o+cws/p++c9Dz8fKhgNKQ="; + vendorHash = "sha256-+IiDWoT9E4SCkmOwPQMTM7AdrXVA6OJa0Fg9Xjq42gI="; env.GOWORK = "off"; From bf802eef35a41896fc4681e16f8debd523dc9f0b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 5 May 2026 01:23:04 +0200 Subject: [PATCH 0075/1079] python3Packages.opensfm: unstable-2023-12-09 -> 0.5.1-unstable-2026-05-04 Changelog: https://github.com/mapillary/OpenSfM/blob/1dc5b95b5c8c4cadd653bdc9f6eb97c0ac1602ba/CHANGELOG.md --- .../0001-cmake-use-system-pybind11.patch | 20 ++ ...-cmake-find-system-distributed-gtest.patch | 51 ++-- .../0003-cmake-use-system-pybind11.patch | 161 ------------ ...x-scripts.patch => 0003-fix-scripts.patch} | 23 +- ...tils.h-conflicts-with-nixpkgs-pybind.patch | 86 ------- .../0005-fix-numpy-2-test-failures.patch | 239 ------------------ .../python-modules/opensfm/default.nix | 80 +++--- 7 files changed, 88 insertions(+), 572 deletions(-) create mode 100644 pkgs/development/python-modules/opensfm/0001-cmake-use-system-pybind11.patch delete mode 100644 pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch rename pkgs/development/python-modules/opensfm/{fix-scripts.patch => 0003-fix-scripts.patch} (54%) delete mode 100644 pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch delete mode 100644 pkgs/development/python-modules/opensfm/0005-fix-numpy-2-test-failures.patch diff --git a/pkgs/development/python-modules/opensfm/0001-cmake-use-system-pybind11.patch b/pkgs/development/python-modules/opensfm/0001-cmake-use-system-pybind11.patch new file mode 100644 index 000000000000..4d65c8407862 --- /dev/null +++ b/pkgs/development/python-modules/opensfm/0001-cmake-use-system-pybind11.patch @@ -0,0 +1,20 @@ +diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt +index 88a7dd8..f755e8e 100644 +--- a/opensfm/src/CMakeLists.txt ++++ b/opensfm/src/CMakeLists.txt +@@ -58,6 +58,7 @@ if (OPENMP_FOUND) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + endif() + ++find_package(pybind11 REQUIRED) + find_package(LAPACK) + find_package(SuiteSparse) + find_package(Eigen3 REQUIRED) +@@ -109,7 +110,6 @@ if(TARGET opencv_imgcodecs) + endif() + + ####### Third party libraries ####### +-add_subdirectory(third_party/pybind11) + add_subdirectory(third_party/akaze) + add_subdirectory(third_party/vlfeat) + diff --git a/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch b/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch index 27b87c0b2d09..1d3db15e8f83 100644 --- a/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch +++ b/pkgs/development/python-modules/opensfm/0002-cmake-find-system-distributed-gtest.patch @@ -1,57 +1,42 @@ -From 79577371be21df40f1f6d4a4fe3453be6df9e93c Mon Sep 17 00:00:00 2001 -From: Someone Serge -Date: Fri, 31 Dec 2021 10:03:25 +0200 -Subject: [PATCH 2/4] cmake: find system-distributed gtest - ---- - opensfm/src/CMakeLists.txt | 19 +++++++------------ - 1 file changed, 7 insertions(+), 12 deletions(-) - diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt -index c85aa6fb..640d47a6 100644 +index f755e8e..3dd6cd2 100644 --- a/opensfm/src/CMakeLists.txt +++ b/opensfm/src/CMakeLists.txt -@@ -52,12 +52,14 @@ if (OPENMP_FOUND) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - endif() - -+find_package(gflags REQUIRED) -+ - find_package(LAPACK) - find_package(SuiteSparse) +@@ -64,6 +64,7 @@ find_package(SuiteSparse) find_package(Eigen3 REQUIRED) find_package(Ceres) --find_package(Gflags REQUIRED) --find_package(Glog REQUIRED) -+find_package(glog REQUIRED) + find_package(Gflags REQUIRED) +find_package(GTest REQUIRED) - # Ceres2 exposes Ceres::ceres target. - # Ceres1 exposes just ceres. -@@ -100,20 +102,13 @@ option(OPENSFM_BUILD_TESTS "Build OpenSfM unit tests." on) + # Try to find glog using its native CMake config first (modern systems) + # Fall back to custom FindGlog.cmake for older systems (e.g., Ubuntu 20.04) +@@ -129,8 +130,6 @@ option(OPENSFM_BUILD_TESTS "Build OpenSfM unit tests." on) if (OPENSFM_BUILD_TESTS) enable_testing() - include_directories(third_party/gtest) - add_definitions(-DCERES_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) -- + + # Gtest if old now and trigger these + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers") +@@ -138,18 +137,12 @@ if (OPENSFM_BUILD_TESTS) + "${CMAKE_CXX_FLAGS} -Wno-deprecated-copy-with-user-provided-copy" + ) + - add_library(gtest - third_party/gtest/gmock_gtest_all.cc - third_party/gtest/gmock_main.cc) - target_include_directories(gtest PRIVATE ${GFLAGS_INCLUDE_DIR}) - +- target_link_libraries(gtest PRIVATE glog::glog) +- set(TEST_MAIN test_main) add_library(${TEST_MAIN} testing_main.cc) target_link_libraries(${TEST_MAIN} - ${GFLAGS_LIBRARY} -- ${GLOG_LIBRARY} ++ gflags + glog::glog - gtest) -+ gflags -+ glog::glog -+ GTest::gtest) ++ GTest::gtest) endif() ####### OpenSfM libraries ####### --- -2.33.1 - diff --git a/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch b/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch deleted file mode 100644 index 2815886e7e18..000000000000 --- a/pkgs/development/python-modules/opensfm/0003-cmake-use-system-pybind11.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 36820fbab1abeeebd99f14e368093e0e3f934ca7 Mon Sep 17 00:00:00 2001 -From: Someone Serge -Date: Sat, 19 Feb 2022 02:37:54 +0200 -Subject: [PATCH 3/4] cmake: use system pybind11 - ---- - opensfm/src/CMakeLists.txt | 3 ++- - opensfm/src/bundle/CMakeLists.txt | 2 +- - opensfm/src/dense/CMakeLists.txt | 2 +- - opensfm/src/features/CMakeLists.txt | 1 - - opensfm/src/foundation/CMakeLists.txt | 1 - - opensfm/src/geo/CMakeLists.txt | 1 - - opensfm/src/geometry/CMakeLists.txt | 1 - - opensfm/src/map/CMakeLists.txt | 3 +-- - opensfm/src/robust/CMakeLists.txt | 1 - - opensfm/src/sfm/CMakeLists.txt | 1 - - 10 files changed, 5 insertions(+), 11 deletions(-) - -diff --git a/opensfm/src/CMakeLists.txt b/opensfm/src/CMakeLists.txt -index 640d47a6..6e391ffa 100644 ---- a/opensfm/src/CMakeLists.txt -+++ b/opensfm/src/CMakeLists.txt -@@ -54,6 +54,8 @@ endif() - - find_package(gflags REQUIRED) - -+find_package(pybind11 REQUIRED) -+ - find_package(LAPACK) - find_package(SuiteSparse) - find_package(Eigen3 REQUIRED) -@@ -82,7 +84,6 @@ else() - endif() - - ####### Third party libraries ####### --add_subdirectory(third_party/pybind11) - add_subdirectory(third_party/akaze) - add_subdirectory(third_party/vlfeat) - -diff --git a/opensfm/src/bundle/CMakeLists.txt b/opensfm/src/bundle/CMakeLists.txt -index 7cd9cf74..307e963a 100644 ---- a/opensfm/src/bundle/CMakeLists.txt -+++ b/opensfm/src/bundle/CMakeLists.txt -@@ -52,7 +52,7 @@ target_link_libraries(pybundle PRIVATE - bundle - geometry - foundation -- pybind11) -+) - set_target_properties(pybundle PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." - ) -diff --git a/opensfm/src/dense/CMakeLists.txt b/opensfm/src/dense/CMakeLists.txt -index cbebb5ea..2728749d 100644 ---- a/opensfm/src/dense/CMakeLists.txt -+++ b/opensfm/src/dense/CMakeLists.txt -@@ -23,7 +23,7 @@ endif() - - pybind11_add_module(pydense python/pybind.cc) - target_include_directories(pydense PRIVATE ${GLOG_INCLUDE_DIR}) --target_link_libraries(pydense PRIVATE dense foundation pybind11) -+target_link_libraries(pydense PRIVATE dense foundation) - set_target_properties(pydense PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." - ) -diff --git a/opensfm/src/features/CMakeLists.txt b/opensfm/src/features/CMakeLists.txt -index b131d30a..6db5b3f1 100644 ---- a/opensfm/src/features/CMakeLists.txt -+++ b/opensfm/src/features/CMakeLists.txt -@@ -22,7 +22,6 @@ target_link_libraries(pyfeatures - PRIVATE - features - foundation -- pybind11 - akaze - ) - set_target_properties(pyfeatures PROPERTIES -diff --git a/opensfm/src/foundation/CMakeLists.txt b/opensfm/src/foundation/CMakeLists.txt -index 40185227..9e0e45e7 100644 ---- a/opensfm/src/foundation/CMakeLists.txt -+++ b/opensfm/src/foundation/CMakeLists.txt -@@ -12,7 +12,6 @@ set(FOUNDATION_FILES - add_library(foundation ${FOUNDATION_FILES}) - target_link_libraries(foundation - PUBLIC -- pybind11 - ${OpenCV_LIBS} - ${OpenMP_libomp_LIBRARY} - Eigen3::Eigen -diff --git a/opensfm/src/geo/CMakeLists.txt b/opensfm/src/geo/CMakeLists.txt -index a9cbae02..75620d06 100644 ---- a/opensfm/src/geo/CMakeLists.txt -+++ b/opensfm/src/geo/CMakeLists.txt -@@ -29,7 +29,6 @@ target_link_libraries(pygeo - PRIVATE - geo - foundation -- pybind11 - ) - set_target_properties(pygeo PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." -diff --git a/opensfm/src/geometry/CMakeLists.txt b/opensfm/src/geometry/CMakeLists.txt -index e6dda2c2..51bfd6c5 100644 ---- a/opensfm/src/geometry/CMakeLists.txt -+++ b/opensfm/src/geometry/CMakeLists.txt -@@ -48,7 +48,6 @@ target_link_libraries(pygeometry - PRIVATE - geometry - foundation -- pybind11 - ) - set_target_properties(pygeometry PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." -diff --git a/opensfm/src/map/CMakeLists.txt b/opensfm/src/map/CMakeLists.txt -index b6f67bcd..f869aa4c 100644 ---- a/opensfm/src/map/CMakeLists.txt -+++ b/opensfm/src/map/CMakeLists.txt -@@ -20,7 +20,7 @@ set(MAP_FILES - add_library(map ${MAP_FILES}) - target_link_libraries(map - PUBLIC -- pybind11 -+ pybind11::module - Eigen3::Eigen - PRIVATE - geo -@@ -39,7 +39,6 @@ target_link_libraries(pymap - map - geometry - bundle -- pybind11 - ) - - if (OPENSFM_BUILD_TESTS) -diff --git a/opensfm/src/robust/CMakeLists.txt b/opensfm/src/robust/CMakeLists.txt -index ce70749f..40bdf7a4 100644 ---- a/opensfm/src/robust/CMakeLists.txt -+++ b/opensfm/src/robust/CMakeLists.txt -@@ -29,7 +29,6 @@ target_link_libraries(pyrobust - PRIVATE - robust - foundation -- pybind11 - ) - set_target_properties(pyrobust PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "${opensfm_SOURCE_DIR}/.." -diff --git a/opensfm/src/sfm/CMakeLists.txt b/opensfm/src/sfm/CMakeLists.txt -index 98c28f41..7f56b791 100644 ---- a/opensfm/src/sfm/CMakeLists.txt -+++ b/opensfm/src/sfm/CMakeLists.txt -@@ -35,7 +35,6 @@ target_include_directories(pysfm PRIVATE ${GLOG_INCLUDE_DIR}) - target_link_libraries(pysfm - PRIVATE - foundation -- pybind11 - sfm - ) - set_target_properties(pysfm PROPERTIES --- -2.33.1 - diff --git a/pkgs/development/python-modules/opensfm/fix-scripts.patch b/pkgs/development/python-modules/opensfm/0003-fix-scripts.patch similarity index 54% rename from pkgs/development/python-modules/opensfm/fix-scripts.patch rename to pkgs/development/python-modules/opensfm/0003-fix-scripts.patch index 634820a32755..1e96bc21fc3e 100644 --- a/pkgs/development/python-modules/opensfm/fix-scripts.patch +++ b/pkgs/development/python-modules/opensfm/0003-fix-scripts.patch @@ -1,5 +1,5 @@ diff --git a/bin/opensfm b/bin/opensfm -index b5ee4b15..f05c0d1c 100755 +index b5ee4b1..f05c0d1 100755 --- a/bin/opensfm +++ b/bin/opensfm @@ -1,12 +1,6 @@ @@ -18,24 +18,11 @@ index b5ee4b15..f05c0d1c 100755 -"$PYTHON" "$DIR"/opensfm_main.py "$@" +exec "$DIR"/opensfm_main.py "$@" diff --git a/bin/opensfm_main.py b/bin/opensfm_main.py -index 31249e12..cc71560c 100755 +index b91abcf..531a492 100755 --- a/bin/opensfm_main.py +++ b/bin/opensfm_main.py -@@ -1,3 +1,5 @@ +@@ -1,3 +1,4 @@ +#!/usr/bin/env python -+ + # pyre-strict import sys - from os.path import abspath, join, dirname - -diff --git a/setup.py b/setup.py -index 1120717f..438a16db 100644 ---- a/setup.py -+++ b/setup.py -@@ -71,6 +71,7 @@ setuptools.setup( - scripts=[ - "bin/opensfm_run_all", - "bin/opensfm", -+ "bin/opensfm_main.py", - ], - package_data={ - "opensfm": [ + from os.path import abspath, dirname, join diff --git a/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch b/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch deleted file mode 100644 index f3cb2db00ecb..000000000000 --- a/pkgs/development/python-modules/opensfm/0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch +++ /dev/null @@ -1,86 +0,0 @@ -From c35b110a83286e7413d7309eb218eb43b52f7d48 Mon Sep 17 00:00:00 2001 -From: Someone Serge -Date: Sat, 19 Feb 2022 14:36:12 +0200 -Subject: [PATCH 4/4] pybind_utils.h: conflicts with nixpkgs' pybind - ---- - opensfm/src/map/pybind_utils.h | 45 +++------------------------------- - 1 file changed, 3 insertions(+), 42 deletions(-) - -diff --git a/opensfm/src/map/pybind_utils.h b/opensfm/src/map/pybind_utils.h -index 817d1a16..3f98a2ab 100644 ---- a/opensfm/src/map/pybind_utils.h -+++ b/opensfm/src/map/pybind_utils.h -@@ -52,38 +52,6 @@ struct sfm_iterator_state { - }; - PYBIND11_NAMESPACE_END_(detail) - --/// Makes an python iterator over the keys (`.first`) of a iterator over pairs --/// from a first and past-the-end InputIterator. --template ()).second), -- typename... Extra> --iterator make_value_iterator(Iterator first, Sentinel last, Extra &&... extra) { -- typedef detail::sfm_iterator_state -- state; -- -- if (!detail::get_type_info(typeid(state), false)) { -- class_(handle(), "iterator", pybind11::module_local()) -- .def("__iter__", [](state &s) -> state & { return s; }) -- .def("__next__", -- [](state &s) -> KeyType { -- if (!s.first_or_done) -- ++s.it; -- else -- s.first_or_done = false; -- if (s.it == s.end) { -- s.first_or_done = true; -- throw stop_iteration(); -- } -- return (*s.it).second; -- }, -- std::forward(extra)..., Policy); -- } -- -- return cast(state{first, last, true}); --} -- - template ()).second)), -@@ -148,12 +116,13 @@ iterator make_ref_iterator(Iterator first, Sentinel last, Extra &&... extra) { - } - - /// Makes a python iterator from a first and past-the-end C++ InputIterator. --template ()), - typename... Extra> - iterator make_ptr_iterator(Iterator first, Sentinel last, Extra &&... extra) { -- typedef detail::iterator_state state; -+ typedef detail::iterator_state state; - - if (!detail::get_type_info(typeid(state), false)) { - class_(handle(), "iterator", pybind11::module_local()) -@@ -176,14 +145,6 @@ iterator make_ptr_iterator(Iterator first, Sentinel last, Extra &&... extra) { - return cast(state{first, last, true}); - } - --/// Makes an iterator over the keys (`.first`) of a stl map-like container --/// supporting `std::begin()`/`std::end()` --template --iterator make_value_iterator(Type &value, Extra &&... extra) { -- return make_value_iterator(std::begin(value), std::end(value), -- extra...); --} - template - iterator make_unique_ptr_value_iterator(Type &value, Extra &&... extra) { --- -2.33.1 - diff --git a/pkgs/development/python-modules/opensfm/0005-fix-numpy-2-test-failures.patch b/pkgs/development/python-modules/opensfm/0005-fix-numpy-2-test-failures.patch deleted file mode 100644 index 444471d37f4d..000000000000 --- a/pkgs/development/python-modules/opensfm/0005-fix-numpy-2-test-failures.patch +++ /dev/null @@ -1,239 +0,0 @@ -diff --git a/opensfm/exif.py b/opensfm/exif.py ---- a/opensfm/exif.py -+++ b/opensfm/exif.py -@@ -509,7 +509,7 @@ class EXIF: - ) - ) - -- if np.all(ypr) is not None: -+ if np.all(ypr != None): - ypr = np.radians(ypr) - - # Convert YPR --> OPK -diff --git a/opensfm/transformations.py b/opensfm/transformations.py ---- a/opensfm/transformations.py -+++ b/opensfm/transformations.py -@@ -232,7 +232,7 @@ def translation_from_matrix(matrix: numpy.ndarray) -> numpy.ndarray: - True - - """ -- return numpy.array(matrix, copy=False)[:3, 3].copy() -+ return numpy.asarray(matrix)[:3, 3].copy() - - - def reflection_matrix(point: numpy.ndarray, normal: numpy.ndarray) -> numpy.ndarray: -@@ -275,7 +275,7 @@ def reflection_from_matrix( - True - - """ -- M = numpy.array(matrix, dtype=numpy.float64, copy=False) -+ M = numpy.asarray(matrix, dtype=numpy.float64) - # normal: unit eigenvector corresponding to eigenvalue -1 - w, V = numpy.linalg.eig(M[:3, :3]) - i = numpy.where(abs(numpy.real(w) + 1.0) < 1e-8)[0] -@@ -339,7 +339,7 @@ def rotation_matrix( - M[:3, :3] = R - if point is not None: - # rotation not around origin -- point = numpy.array(point[:3], dtype=numpy.float64, copy=False) -+ point = numpy.asarray(point[:3], dtype=numpy.float64) - M[:3, 3] = point - numpy.dot(R, point) - return M - -@@ -359,7 +359,7 @@ def rotation_from_matrix( - True - - """ -- R = numpy.array(matrix, dtype=numpy.float64, copy=False) -+ R = numpy.asarray(matrix, dtype=numpy.float64) - R33 = R[:3, :3] - # direction: unit eigenvector of R33 corresponding to eigenvalue of 1 - w, W = numpy.linalg.eig(R33.T) -@@ -444,7 +444,7 @@ def scale_from_matrix( - True - - """ -- M = numpy.array(matrix, dtype=numpy.float64, copy=False) -+ M = numpy.asarray(matrix, dtype=numpy.float64) - M33 = M[:3, :3] - factor = numpy.trace(M33) - 2.0 - try: -@@ -505,11 +505,11 @@ def projection_matrix( - - """ - M = numpy.identity(4) -- point = numpy.array(point[:3], dtype=numpy.float64, copy=False) -+ point = numpy.asarray(point[:3], dtype=numpy.float64) - normal = unit_vector(normal[:3]) - if perspective is not None: - # perspective projection -- perspective = numpy.array(perspective[:3], dtype=numpy.float64, copy=False) -+ perspective = numpy.asarray(perspective[:3], dtype=numpy.float64) - M[0, 0] = M[1, 1] = M[2, 2] = numpy.dot(perspective - point, normal) - M[:3, :3] -= numpy.outer(perspective, normal) - if pseudo: -@@ -522,7 +522,7 @@ def projection_matrix( - M[3, 3] = numpy.dot(perspective, normal) - elif direction is not None: - # parallel projection -- direction = numpy.array(direction[:3], dtype=numpy.float64, copy=False) -+ direction = numpy.asarray(direction[:3], dtype=numpy.float64) - scale = numpy.dot(direction, normal) - M[:3, :3] -= numpy.outer(direction, normal) / scale - M[:3, 3] = direction * (numpy.dot(point, normal) / scale) -@@ -569,7 +569,7 @@ def projection_from_matrix( - True - - """ -- M = numpy.array(matrix, dtype=numpy.float64, copy=False) -+ M = numpy.asarray(matrix, dtype=numpy.float64) - M33 = M[:3, :3] - w, V = numpy.linalg.eig(M) - i = numpy.where(abs(numpy.real(w) - 1.0) < 1e-8)[0] -@@ -726,7 +726,7 @@ def shear_from_matrix( - True - - """ -- M = numpy.array(matrix, dtype=numpy.float64, copy=False) -+ M = numpy.asarray(matrix, dtype=numpy.float64) - M33 = M[:3, :3] - # normal: cross independent eigenvectors corresponding to the eigenvalue 1 - w, V = numpy.linalg.eig(M33) -@@ -790,7 +790,7 @@ def decompose_matrix( - True - - """ -- M = numpy.array(matrix, dtype=numpy.float64, copy=True).T -+ M = numpy.asarray(matrix, dtype=numpy.float64, copy=True).T - if abs(M[3, 3]) < _EPS: - raise ValueError("M[3, 3] is zero") - M /= M[3, 3] -@@ -982,8 +982,8 @@ def affine_matrix_from_points( - More examples in superimposition_matrix() - - """ -- v0 = numpy.array(v0, dtype=numpy.float64, copy=True) -- v1 = numpy.array(v1, dtype=numpy.float64, copy=True) -+ v0 = numpy.asarray(v0, dtype=numpy.float64, copy=True) -+ v1 = numpy.asarray(v1, dtype=numpy.float64, copy=True) - - ndims = v0.shape[0] - if ndims < 2 or v0.shape[1] < ndims or v0.shape != v1.shape: -@@ -1099,8 +1099,8 @@ def superimposition_matrix( - True - - """ -- v0 = numpy.array(v0, dtype=numpy.float64, copy=False)[:3] -- v1 = numpy.array(v1, dtype=numpy.float64, copy=False)[:3] -+ v0 = numpy.asarray(v0, dtype=numpy.float64)[:3] -+ v1 = numpy.asarray(v1, dtype=numpy.float64)[:3] - return affine_matrix_from_points(v0, v1, shear=False, scale=scale, usesvd=usesvd) - - -@@ -1198,7 +1198,7 @@ def euler_from_matrix( - j = _NEXT_AXIS[i + parity] - k = _NEXT_AXIS[i - parity + 1] - -- M = numpy.array(matrix, dtype=numpy.float64, copy=False)[:3, :3] -+ M = numpy.asarray(matrix, dtype=numpy.float64)[:3, :3] - if repetition: - sy = math.sqrt(M[i, j] * M[i, j] + M[i, k] * M[i, k]) - if sy > _EPS: -@@ -1329,7 +1329,7 @@ def quaternion_matrix(quaternion: numpy.ndarray) -> numpy.ndarray: - True - - """ -- q = numpy.array(quaternion, dtype=numpy.float64, copy=True) -+ q = numpy.asarray(quaternion, dtype=numpy.float64, copy=True) - n = numpy.dot(q, q) - if n < _EPS: - return numpy.identity(4) -@@ -1379,7 +1379,7 @@ def quaternion_from_matrix( - True - - """ -- M = numpy.array(matrix, dtype=numpy.float64, copy=False)[:4, :4] -+ M = numpy.asarray(matrix, dtype=numpy.float64)[:4, :4] - if isprecise: - q = numpy.empty((4,)) - t = numpy.trace(M) -@@ -1460,7 +1460,7 @@ def quaternion_conjugate(quaternion: numpy.ndarray) -> numpy.ndarray: - True - - """ -- q = numpy.array(quaternion, dtype=numpy.float64, copy=True) -+ q = numpy.asarray(quaternion, dtype=numpy.float64, copy=True) - numpy.negative(q[1:], q[1:]) - return q - -@@ -1474,7 +1474,7 @@ def quaternion_inverse(quaternion: numpy.ndarray) -> numpy.ndarray: - True - - """ -- q = numpy.array(quaternion, dtype=numpy.float64, copy=True) -+ q = numpy.asarray(quaternion, dtype=numpy.float64, copy=True) - numpy.negative(q[1:], q[1:]) - return q / numpy.dot(q, q) - -@@ -1496,7 +1496,7 @@ def quaternion_imag(quaternion: numpy.ndarray) -> numpy.ndarray: - array([ 0., 1., 2.]) - - """ -- return numpy.array(quaternion[1:4], dtype=numpy.float64, copy=True) -+ return numpy.asarray(quaternion[1:4], dtype=numpy.float64, copy=True) - - - def quaternion_slerp( -@@ -1654,7 +1654,7 @@ def vector_norm( - 1.0 - - """ -- data = numpy.array(data, dtype=numpy.float64, copy=True) -+ data = numpy.asarray(data, dtype=numpy.float64, copy=True) - if out is None: - if data.ndim == 1: - return math.sqrt(numpy.dot(data, data)) -@@ -1697,13 +1697,13 @@ def unit_vector( - - """ - if out is None: -- data = numpy.array(data, dtype=numpy.float64, copy=True) -+ data = numpy.asarray(data, dtype=numpy.float64, copy=True) - if data.ndim == 1: - data /= math.sqrt(numpy.dot(data, data)) - return data - else: - if out is not data: -- out[:] = numpy.array(data, copy=False) -+ out[:] = numpy.asarray(data) - data = out - length = numpy.atleast_1d(numpy.sum(data * data, axis)) - numpy.sqrt(length, length) -@@ -1777,8 +1777,8 @@ def angle_between_vectors( - True - - """ -- v0 = numpy.array(v0, dtype=numpy.float64, copy=False) -- v1 = numpy.array(v1, dtype=numpy.float64, copy=False) -+ v0 = numpy.asarray(v0, dtype=numpy.float64) -+ v1 = numpy.asarray(v1, dtype=numpy.float64) - dot = numpy.sum(v0 * v1, axis=axis) - dot /= vector_norm(v0, axis=axis) * vector_norm(v1, axis=axis) - dot = numpy.clip(dot, -1.0, 1.0) -@@ -1826,9 +1826,9 @@ def is_same_transform(matrix0: numpy.ndarray, matrix1: numpy.ndarray) -> numpy.n - False - - """ -- matrix0 = numpy.array(matrix0, dtype=numpy.float64, copy=True) -+ matrix0 = numpy.asarray(matrix0, dtype=numpy.float64, copy=True) - matrix0 /= matrix0[3, 3] -- matrix1 = numpy.array(matrix1, dtype=numpy.float64, copy=True) -+ matrix1 = numpy.asarray(matrix1, dtype=numpy.float64, copy=True) - matrix1 /= matrix1[3, 3] - return numpy.allclose(matrix0, matrix1) - -@@ -1874,3 +1874,4 @@ if __name__ == "__main__": - - numpy.set_printoptions(suppress=True, precision=5) - doctest.testmod() -+ diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix index 59bf764902dd..119c4a5d8917 100644 --- a/pkgs/development/python-modules/opensfm/default.nix +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -3,8 +3,10 @@ stdenv, buildPythonPackage, fetchFromGitHub, + runCommand, + srcOnly, + bashNonInteractive, cmake, - opencv4, ceres-solver, suitesparse, metis, @@ -14,6 +16,9 @@ pybind11, numpy, pyyaml, + flask, + fpdf2, + opencv-python, lapack, gtest, gflags, @@ -22,46 +27,42 @@ networkx, pillow, exifread, - gpxpy, pyproj, python-dateutil, joblib, - repoze-lru, xmltodict, - distutils, cloudpickle, scipy, sphinx, matplotlib, - fpdf, + scikit-build-core, + ninja, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "opensfm"; - version = "unstable-2023-12-09"; + version = "0.5.1-unstable-2026-05-04"; pyproject = true; src = fetchFromGitHub { owner = "mapillary"; repo = "OpenSfM"; - rev = "7f170d0dc352340295ff480378e3ac37d0179f8e"; - sha256 = "sha256-l/HTVenC+L+GpMNnDgnSGZ7+Qd2j8b8cuTs3SmORqrg="; + rev = "1dc5b95b5c8c4cadd653bdc9f6eb97c0ac1602ba"; + sha256 = "sha256-K3+H8QSzTxIGAtYDGqOuJFTVaqk+B/R/MDMepJ/bRxY="; }; patches = [ + ./0001-cmake-use-system-pybind11.patch ./0002-cmake-find-system-distributed-gtest.patch - ./0003-cmake-use-system-pybind11.patch - ./0004-pybind_utils.h-conflicts-with-nixpkgs-pybind.patch - ./0005-fix-numpy-2-test-failures.patch # not upstreamed due to cla, but you're free upstream it -@pbsds - ./fix-scripts.patch + ./0003-fix-scripts.patch ]; postPatch = '' - substituteInPlace opensfm/src/CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" - - rm opensfm/src/cmake/FindGlog.cmake + # devendor + rm opensfm/src/cmake/FindGlog.cmake # (ubuntu 20.04 fallback) rm opensfm/src/cmake/FindGflags.cmake + rm -rf opensfm/src/third_party/gtest + rm -rf opensfm/src/third_party/pybind11 # HAHOG is the default descriptor. # We'll test both HAHOG and SIFT because this is @@ -72,15 +73,20 @@ buildPythonPackage rec { # make opensfm correctly import glog headers export CXXFLAGS=-DGLOG_USE_GLOG_EXPORT - sed -i -e 's/^.*BuildDoc.*$//' setup.py + # we use the pyproject.toml + rm setup.py ''; - build-system = [ setuptools ]; + dontUseCmakeConfigure = true; + + build-system = [ + setuptools + scikit-build-core + ninja + ]; nativeBuildInputs = [ cmake - pkg-config - sphinx ]; buildInputs = [ @@ -93,41 +99,45 @@ buildPythonPackage rec { gtest glog pybind11 + bashNonInteractive # for patchShebangs ]; dependencies = [ numpy scipy pyyaml - opencv4.cxxdev + flask + fpdf2 + opencv-python networkx pillow matplotlib - fpdf exifread - gpxpy pyproj python-dateutil joblib - repoze-lru xmltodict cloudpickle ]; nativeCheckInputs = [ pytestCheckHook - distutils ]; - dontUseCmakeBuildDir = true; - cmakeFlags = [ - "-Bcmake_build" - "-Sopensfm/src" - ]; + # pyproject.toml has yet to enable the [project.scripts] + postInstall = '' + if [[ -d $out/bin ]]; then + echo >&2 "ERROR: $out/bin found, re-check our assumptions" + false + fi + install -Dt $out/bin -m +rwx bin/opensfm + install -Dt $out/bin -m +rwx bin/opensfm_run_all + install -Dt $out/bin -m +rwx bin/opensfm_main.py + ''; disabledTests = [ - "test_run_all" # Matplotlib issues. Broken integration is less useless than a broken build - "test_match_candidates_from_metadata_bow" # flaky + # flaky + "test_match_candidates_from_metadata_bow" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reconstruction_incremental" @@ -143,8 +153,8 @@ buildPythonPackage rec { lib.maintainers.SomeoneSerge ]; license = lib.licenses.bsd2; - changelog = "https://github.com/mapillary/OpenSfM/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/mapillary/OpenSfM/blob/${finalAttrs.src.rev}/CHANGELOG.md"; description = "Open source Structure-from-Motion pipeline from Mapillary"; homepage = "https://opensfm.org/"; }; -} +}) From 45b61eaae7445c3bb042557aebf8334ba07058e4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 5 May 2026 04:51:38 +0200 Subject: [PATCH 0076/1079] python3Packages.opensfm: add passthru.tests --- .../python-modules/opensfm/default.nix | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/development/python-modules/opensfm/default.nix b/pkgs/development/python-modules/opensfm/default.nix index 119c4a5d8917..2a7a13e7924c 100644 --- a/pkgs/development/python-modules/opensfm/default.nix +++ b/pkgs/development/python-modules/opensfm/default.nix @@ -146,6 +146,27 @@ buildPythonPackage (finalAttrs: { pythonImportsCheck = [ "opensfm" ]; + # https://opensfm.org/docs/using.html#quickstart + passthru.tests = lib.genAttrs' [ "berlin" "lund" ] ( + name: + lib.nameValuePair "integration-test-${name}" ( + runCommand "opensfm-integration-test-${name}" + { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + } + '' + set -euo pipefail + opensfm --help + cp -r ${srcOnly finalAttrs.finalPackage}/data/${name} data + chmod -R +w data/ + bash -x $(command -v opensfm_run_all) data/ + if [[ -s data/camera_models.json && -s data/undistorted/reconstruction.json ]]; then + touch $out + fi + '' + ) + ); + meta = { broken = stdenv.hostPlatform.isDarwin; maintainers = [ From be1aa7bf49ce600220c859016b8afa2c1c99d20f Mon Sep 17 00:00:00 2001 From: Harinn Date: Tue, 5 May 2026 18:09:53 +0700 Subject: [PATCH 0077/1079] gst123: 0.4.1 -> 0.4.1-unstable-2025-11-28 --- pkgs/by-name/gs/gst123/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gs/gst123/package.nix b/pkgs/by-name/gs/gst123/package.nix index 5bf2cdfa75f3..c15f9ce7f108 100644 --- a/pkgs/by-name/gs/gst123/package.nix +++ b/pkgs/by-name/gs/gst123/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst123"; - version = "0.4.1"; + version = "0.4.1-unstable-2025-11-28"; src = fetchFromGitHub { owner = "swesterfeld"; repo = "gst123"; - rev = finalAttrs.version; - hash = "sha256-7qS7JJ7EY1uFGX3FxBxgH6LzK4XUoTPHR0QVwUWRz+g="; + rev = "3680535cb5ab12d9bfba8f7de8cf9a83fb01fe22"; + hash = "sha256-+thGzcmBQanj7fGRImWk4PVRFBFLVHYQIP1HYoUzglk="; }; nativeBuildInputs = [ From 071f6a5bca23efd6dd237d16ceaaef3b25ed2e8e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 May 2026 12:01:28 +0000 Subject: [PATCH 0078/1079] python3Packages.mbstrdecoder: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/mbstrdecoder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mbstrdecoder/default.nix b/pkgs/development/python-modules/mbstrdecoder/default.nix index 96db79782565..e4a2959b84c1 100644 --- a/pkgs/development/python-modules/mbstrdecoder/default.nix +++ b/pkgs/development/python-modules/mbstrdecoder/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "mbstrdecoder"; - version = "1.1.4"; + version = "1.1.5"; pyproject = true; src = fetchFromGitHub { owner = "thombashi"; repo = "mbstrdecoder"; tag = "v${version}"; - hash = "sha256-rJ3Q7/xYPO0jBuzhYm2aIhPar2tbJIxHnHR0y0HWtik="; + hash = "sha256-RPtxoI4fFiBHBOWOdGueVjPPOAUjDThawS80SIoTQ78="; }; nativeBuildInputs = [ From 26480f73386b9edced17982b962810f1e578be5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 May 2026 16:51:38 +0000 Subject: [PATCH 0079/1079] vscode-extensions.ms-python.mypy-type-checker: 2025.2.0 -> 2026.4.0 --- .../vscode/extensions/ms-python.mypy-type-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix index 60700645d32e..5daf4054b0ea 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.mypy-type-checker/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-python"; name = "mypy-type-checker"; - version = "2025.2.0"; - hash = "sha256-VJ/XSC4cbIjgxKLsXxUxwko+HR0U59c8OrhYnKPJu4g="; + version = "2026.4.0"; + hash = "sha256-N0zml16XSBwjGHzCR1L0W9WiSgqD/375VIQGpGfCkFE="; }; meta = { From 3f7dbf019207086bf5855157282161d684f7cd54 Mon Sep 17 00:00:00 2001 From: Zachary Arnaise <121795280+zacharyarnaise@users.noreply.github.com> Date: Tue, 5 May 2026 19:01:34 +0200 Subject: [PATCH 0080/1079] tilt: 0.37.0 -> 0.37.3 --- pkgs/by-name/ti/tilt/assets.nix | 2 +- pkgs/by-name/ti/tilt/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix index c9522a620638..b156a23907a5 100644 --- a/pkgs/by-name/ti/tilt/assets.nix +++ b/pkgs/by-name/ti/tilt/assets.nix @@ -68,7 +68,7 @@ stdenvNoCC.mkDerivation { dontInstall = true; outputHashAlgo = "sha256"; - outputHash = "sha256-78RL0hYnnlWFxBZO4pvR9eSVR4hRD2FK+C0Th2QPYlc="; + outputHash = "sha256-3P42xJ1tBVRpe1hNDy4ax9bUmiaPnSZolTGmsKpzYUA="; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix index 5916daf2a50b..0a2872f88f13 100644 --- a/pkgs/by-name/ti/tilt/package.nix +++ b/pkgs/by-name/ti/tilt/package.nix @@ -9,13 +9,13 @@ let running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.37.0"; + version = "0.37.3"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "tilt"; tag = "v${version}"; - hash = "sha256-NxxQP53vN+1hJUBZyk0bJFlOcUFxU2bfFzwTGkTKuFo="; + hash = "sha256-gJQ9ECGsJ4VBASxmNewOhA3zLl7YjMm5GRDuAefmFYE="; }; }; From 96b54b19433a2dfb09430a24e22a11dab30fd9e8 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:22:41 +0200 Subject: [PATCH 0081/1079] quill-qr: set license reason: could not find a license in the source code --- pkgs/by-name/qu/quill-qr/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/qu/quill-qr/package.nix b/pkgs/by-name/qu/quill-qr/package.nix index 79b0c16cb4c0..2ede6e9feee2 100644 --- a/pkgs/by-name/qu/quill-qr/package.nix +++ b/pkgs/by-name/qu/quill-qr/package.nix @@ -45,5 +45,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/colonelpanic8/quill-qr"; maintainers = with lib.maintainers; [ imalison ]; platforms = with lib.platforms; linux; + license = lib.licenses.unfree; }; } From 748036a3df1a94f5f97dd15b6af0dcae24f126d6 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:27:46 +0200 Subject: [PATCH 0082/1079] replace: set license reason: could not find a license in the source code --- pkgs/by-name/re/replace/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/re/replace/package.nix b/pkgs/by-name/re/replace/package.nix index 0030d562f921..1d8550f4870f 100644 --- a/pkgs/by-name/re/replace/package.nix +++ b/pkgs/by-name/re/replace/package.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://replace.richardlloyd.org.uk/"; mainProgram = "replace-literal"; platforms = lib.platforms.unix; + license = lib.licenses.unfree; }; }) From ab481c5c42c962c25f847a42b1b720f4ad1e414e Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:35:10 +0200 Subject: [PATCH 0083/1079] rofi-menugen: set license reason: could not find any license in the source code --- pkgs/by-name/ro/rofi-menugen/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ro/rofi-menugen/package.nix b/pkgs/by-name/ro/rofi-menugen/package.nix index 2b5ac7ed0281..55fd7ac1f2a7 100644 --- a/pkgs/by-name/ro/rofi-menugen/package.nix +++ b/pkgs/by-name/ro/rofi-menugen/package.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation { homepage = "https://github.com/octotep/menugen"; maintainers = [ ]; platforms = lib.platforms.all; + license = lib.licenses.unfree; }; } From 629ef0430dada7da0e16f7223aed3b2f5fc70c38 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:36:51 +0200 Subject: [PATCH 0084/1079] rofi-power-menu: set license source: https://github.com/jluttine/rofi-power-menu/blob/master/COPYING --- pkgs/by-name/ro/rofi-power-menu/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ro/rofi-power-menu/package.nix b/pkgs/by-name/ro/rofi-power-menu/package.nix index 1d1219cc31f7..1b149a5b785c 100644 --- a/pkgs/by-name/ro/rofi-power-menu/package.nix +++ b/pkgs/by-name/ro/rofi-power-menu/package.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ ikervagyok ]; platforms = lib.platforms.linux; mainProgram = "rofi-power-menu"; + license = lib.licenses.mit; }; }) From a352e32786fb99922864944e1503e185a68a086c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:47:03 +0200 Subject: [PATCH 0085/1079] rt: set license source: https://github.com/bestpractical/rt/blob/stable/COPYING --- pkgs/by-name/rt/rt/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/rt/rt/package.nix b/pkgs/by-name/rt/rt/package.nix index 71e4ab7b5841..1acee7c45088 100644 --- a/pkgs/by-name/rt/rt/package.nix +++ b/pkgs/by-name/rt/rt/package.nix @@ -177,5 +177,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { platforms = lib.platforms.unix; + license = lib.licenses.gpl2Only; }; }) From 7a72b3ecb54c69e94e84d45c8e70eb13d26ad46e Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 6 May 2026 01:41:56 +0800 Subject: [PATCH 0086/1079] writeHaskell: allow providing function for libraries This is much safer at avoiding version mismatches. --- pkgs/build-support/writers/scripts.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 43880c62ccaf..bb649db24575 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -17,6 +17,7 @@ let last optionalString strings + toFunction types ; in @@ -751,7 +752,7 @@ rec { ## `pkgs.writers.writeHaskell` usage example ```nix - writeHaskell "missiles" { libraries = [ pkgs.haskellPackages.acme-missiles ]; } '' + writeHaskell "missiles" { libraries = hpkgs: [ hpkgs.acme-missiles ]; } '' import Acme.Missiles main = launchMissiles @@ -777,7 +778,7 @@ rec { makeBinWriter { compileScript = '' cp $contentPath tmp.hs - ${(ghc.withPackages (_: libraries))}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs + ${(ghc.withPackages (toFunction libraries))}/bin/ghc ${lib.escapeShellArgs ghcArgs'} tmp.hs mv tmp $out ''; inherit makeWrapperArgs strip; From 0bedef69d94798619f3246aad0f29889a3b9d785 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 19:54:25 +0200 Subject: [PATCH 0087/1079] rubik: set license source: https://fonts.google.com/specimen/Rubik/license --- pkgs/by-name/ru/rubik/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ru/rubik/package.nix b/pkgs/by-name/ru/rubik/package.nix index 67ac23964f55..2cfa62c3b8d5 100644 --- a/pkgs/by-name/ru/rubik/package.nix +++ b/pkgs/by-name/ru/rubik/package.nix @@ -46,5 +46,6 @@ stdenvNoCC.mkDerivation { glyphs were improved, and glyph set was expanded to GF Cyrillic Plus. ''; platforms = lib.platforms.all; + license = lib.licenses.ofl; }; } From 304be79271cf70a42db5da3cf12ac33de72e4b3b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 20:00:11 +0200 Subject: [PATCH 0088/1079] setconf: set license source: https://github.com/xyproto/setconf/blob/main/COPYING --- pkgs/by-name/se/setconf/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/se/setconf/package.nix b/pkgs/by-name/se/setconf/package.nix index 17acd52dcad0..275adf7f4b41 100644 --- a/pkgs/by-name/se/setconf/package.nix +++ b/pkgs/by-name/se/setconf/package.nix @@ -26,6 +26,7 @@ let changelog = "https://github.com/xyproto/setconf/releases/tag/${self.src.rev}"; mainProgram = "setconf"; maintainers = [ ]; + license = lib.licenses.gpl2Only; }; }; in From b5702359f00e0274bd7773bab40564d97a475beb Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 20:02:59 +0200 Subject: [PATCH 0089/1079] sqlboiler-crdb: set license reason: could not find a license in the source code --- pkgs/by-name/sq/sqlboiler-crdb/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sq/sqlboiler-crdb/package.nix b/pkgs/by-name/sq/sqlboiler-crdb/package.nix index e3fdb1e00d7a..53e22d98c956 100644 --- a/pkgs/by-name/sq/sqlboiler-crdb/package.nix +++ b/pkgs/by-name/sq/sqlboiler-crdb/package.nix @@ -25,5 +25,6 @@ buildGoModule { homepage = "https://github.com/glerchundi/sqlboiler-crdb/"; maintainers = with lib.maintainers; [ dgollings ]; platforms = lib.platforms.unix; + license = lib.licenses.unfree; }; } From 0c86c139b1561781fa96ae6526e56953294d1a61 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Tue, 5 May 2026 20:18:53 +0200 Subject: [PATCH 0090/1079] tesh: set license source: https://github.com/OceanSprint/tesh/blob/main/LICENSE --- pkgs/by-name/te/tesh/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/te/tesh/package.nix b/pkgs/by-name/te/tesh/package.nix index dc969dd93b8d..9a6eae86f6ec 100644 --- a/pkgs/by-name/te/tesh/package.nix +++ b/pkgs/by-name/te/tesh/package.nix @@ -1,4 +1,8 @@ -{ python3Packages, fetchFromGitHub }: +{ + lib, + python3Packages, + fetchFromGitHub, +}: let version = "0.3.2"; @@ -23,4 +27,8 @@ python3Packages.buildPythonPackage rec { pexpect distutils ]; + + meta = { + license = lib.licenses.mit; + }; } From 41eb2fdedf16abb07eafb8bbd75b9c8920ae9b5c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 5 May 2026 21:15:19 +0200 Subject: [PATCH 0091/1079] python3Packages.pyrealsense2: fix build fixes https://hydra.nixos.org/build/326870962 zhf https://github.com/NixOS/nixpkgs/issues/516381 upstream pr: https://github.com/realsenseai/librealsense/pull/15022 The fix i pushed to https://github.com/NixOS/nixpkgs/pull/427314 was needed to build all non-gui variants after updating, but the python wrapper had a second issue. I did not uncover that before the merge because because my builders OOMed trying to build more than one variant in parallel. --- .../librealsense/0001-fix-pybind11.patch | 31 +++++++++++++++++++ .../libraries/librealsense/default.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/librealsense/0001-fix-pybind11.patch diff --git a/pkgs/development/libraries/librealsense/0001-fix-pybind11.patch b/pkgs/development/libraries/librealsense/0001-fix-pybind11.patch new file mode 100644 index 000000000000..1468eb5847d7 --- /dev/null +++ b/pkgs/development/libraries/librealsense/0001-fix-pybind11.patch @@ -0,0 +1,31 @@ +From 1d4f6917c1e71c6f4716be844bc4ef99e07a64f1 Mon Sep 17 00:00:00 2001 +From: Peder Bergebakken Sundt +Date: Tue, 5 May 2026 20:58:35 +0200 +Subject: [PATCH] Fix building with pybind11 v3.0.2 + +pyrealsense2 fails to build with pybind11 v3.0.2 + +Build error log: https://cache.nixos.org/log/kcry0khph8g0crka6zzkznn8izfvsrq1-librealsense-2.56.3.drv + +Cause: https://github.com/pybind/pybind11/pull/5533 + +I based this fix on https://github.com/NGSolve/netgen/commit/ceacae3844ed2f0c48c8b6a3a82904b16c594f41 + +I'm not very familiar with pybind11, please double check whether this fix is correct. +--- + wrappers/python/pyrs_frame.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wrappers/python/pyrs_frame.cpp b/wrappers/python/pyrs_frame.cpp +index c5e07bd17f..a2a974eb1b 100644 +--- a/wrappers/python/pyrs_frame.cpp ++++ b/wrappers/python/pyrs_frame.cpp +@@ -144,7 +144,7 @@ void init_frame(py::module &m) { + .def_property_readonly("frame_number", &rs2::frame::get_frame_number, "The frame number. Identical to calling get_frame_number.") + .def("get_data_size", &rs2::frame::get_data_size, "Retrieve data size from frame handle.") + .def("get_data", get_frame_data, "Retrieve data from the frame handle.", py::keep_alive<0, 1>()) +- .def_property_readonly("data", get_frame_data, "Data from the frame handle. Identical to calling get_data.", py::keep_alive<0, 1>()) ++ .def_property_readonly("data", py::cpp_function(get_frame_data, "Data from the frame handle. Identical to calling get_data.", py::keep_alive<0, 1>())) + .def("get_profile", &rs2::frame::get_profile, "Retrieve stream profile from frame handle.") + .def_property_readonly("profile", &rs2::frame::get_profile, "Stream profile from frame handle. Identical to calling get_profile.") + .def("keep", &rs2::frame::keep, "Keep the frame, otherwise if no refernce to the frame, the frame will be released.") diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 815a6b8b2d8f..abef5142282f 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -78,6 +78,8 @@ stdenv'.mkDerivation rec { patches = [ ./py_pybind11_no_external_download.patch ./install-presets.patch + # upstream pr: https://github.com/realsenseai/librealsense/pull/15022 + ./0001-fix-pybind11.patch ]; postPatch = '' From 48e35efd78209c4458d7efe8705c18627b5cd03c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 5 May 2026 21:34:20 +0200 Subject: [PATCH 0092/1079] webdav: 5.11.7 -> 5.11.8 Diff: https://github.com/hacdias/webdav/compare/v5.11.7...v5.11.8 Changelog: https://github.com/hacdias/webdav/releases/tag/v5.11.8 --- pkgs/by-name/we/webdav/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index aa5bbbc8fed7..7ae5a2a0e14b 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "webdav"; - version = "5.11.7"; + version = "5.11.8"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${finalAttrs.version}"; - hash = "sha256-xvkkOesOFcgT1OTm0X87eKFdKjEZpMu8Pw+YRTGjJlI="; + hash = "sha256-JVywkKgIeUTlmQ+7QTiN6kmQmeKiHuUHaQoPeqGXvkY="; }; - vendorHash = "sha256-fSFVqZZXkhFeJPompd6mg+zNV40k5C3pJSjrXiiaPJ8="; + vendorHash = "sha256-9RV6koGiycFLnr5Q/Lqcil0xNRd5KKrPXwylCurnYPg="; __darwinAllowLocalNetworking = true; From 1d32899a5c292b3236556d29c9232dbb2766f73a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 May 2026 19:59:22 +0000 Subject: [PATCH 0093/1079] vscode-extensions.sonarsource.sonarlint-vscode: 5.2.0 -> 5.2.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ae4c144d6584..fa9d6c8a9b81 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4357,8 +4357,8 @@ let mktplcRef = { publisher = "sonarsource"; name = "sonarlint-vscode"; - version = "5.2.0"; - hash = "sha256-Q9wP+PqjWVyqVh0FK8lx+k4bxacyQO7aLtZX98fRl7g="; + version = "5.2.1"; + hash = "sha256-GVuFP0n2Su6YAh/KwtkEFvZK9hAyVDIWfoBjaPQyUFM="; }; meta.license = lib.licenses.lgpl3Only; }; From 70d71edf851a7bb71a948e7f7deedc146caea22c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 5 May 2026 23:41:18 +0000 Subject: [PATCH 0094/1079] spade: 0.17.0 -> 0.18.0 Diff: https://gitlab.com/spade-lang/spade/-/compare/v0.17.0...0.18.0 Changelog: https://gitlab.com/spade-lang/spade/-/blob/v0.18.0/CHANGELOG.md --- pkgs/by-name/sp/spade/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix index 1cb48b5adaa1..448e439e3038 100644 --- a/pkgs/by-name/sp/spade/package.nix +++ b/pkgs/by-name/sp/spade/package.nix @@ -16,18 +16,18 @@ rustPlatform.buildRustPackage rec { pname = "spade"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitLab { owner = "spade-lang"; repo = "spade"; rev = "v${version}"; - hash = "sha256-jdcwIn/CiibWiYhh4yICa1LWXZCI0r2w3AFDRO0ZbFw="; + hash = "sha256-BSbE0hJvCIaxxqCo+QltZuoS2yst6TgUnHXAE4kZD2A="; # only needed for vatch, which contains test data fetchSubmodules = true; }; - cargoHash = "sha256-JnyICAJ+W9ZwQpJnSVkEb5dSvkrcnx6PZ/IgQMEOsag="; + cargoHash = "sha256-+lQiXOof6MnjnVf8CXNYgeyzFMf0myLErbSfnjLVZWU="; # TODO: somehow respect https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit passthru.updateScript = _experimental-update-script-combinators.sequence [ From d72c336516b9b019028790b9eb354ddcff310c9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:27:52 +0000 Subject: [PATCH 0095/1079] CuboCore.corehunt: 5.0.0 -> 5.0.1 --- pkgs/applications/misc/cubocore-packages/corehunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index 978570ceac4c..6b366c3f4650 100644 --- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corehunt"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "corehunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-QJJ+e+5UKka1Hbrtyn+agpJ7FLADHupZt41K8Mq8H4c="; + hash = "sha256-D3O1RnhXZmIGlk75OxfYvQI+8sytXTho2MvccI5Xyvg="; }; nativeBuildInputs = [ From 002357d1ebf0bf3f1d6f7efcff179b8fc6e18343 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:28:32 +0000 Subject: [PATCH 0096/1079] CuboCore.coregarage: 5.0.0 -> 5.0.1 --- .../misc/cubocore-packages/coregarage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 6772e6a23d4e..74b5bbd5a7cf 100644 --- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coregarage"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "coregarage"; tag = "v${finalAttrs.version}"; - hash = "sha256-boe7z8KPnMaoWekBFS4g/Ay98rpREeLMAsHOr2olYws="; + hash = "sha256-aPBqlt/bL1cx6mLaf/gEFQB+NEvGQJioBJZ4QAxTwzw="; }; nativeBuildInputs = [ From 133c71ba43c9499a32331ce6a4d3af536c9afd6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:29:09 +0000 Subject: [PATCH 0097/1079] CuboCore.coreinfo: 5.0.0 -> 5.0.1 --- pkgs/applications/misc/cubocore-packages/coreinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix index 78328bdc8c63..441069640236 100644 --- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coreinfo"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "coreinfo"; tag = "v${finalAttrs.version}"; - hash = "sha256-/L69lrkJZh+SJRoNxvogdJ5KRIorwcBzm7WGxrNpexM="; + hash = "sha256-Ct/vAxtdFcXIxleaePhWD5L42d88go/3arYKSrw/c2c="; }; nativeBuildInputs = [ From 3ae60723c13824ebf7626503ad9d4f776ae40a6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:37:06 +0000 Subject: [PATCH 0098/1079] CuboCore.corestats: 5.0.0 -> 5.0.1 --- .../applications/misc/cubocore-packages/corestats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix index ecdb8642d910..4b68d5a3f4d7 100644 --- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corestats"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "corestats"; tag = "v${finalAttrs.version}"; - hash = "sha256-0d03y3AYWxXh9DZrbPWqk34yq7iy5xUn/oMmJBu5GqQ="; + hash = "sha256-4wVBC/NeexJIFsDOjqHFC/u3Rapd/22fjH5yMVafWPY="; }; nativeBuildInputs = [ From 068f4aee657e8bd2c6a493bf79afd66fa4fa41f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:37:59 +0000 Subject: [PATCH 0099/1079] CuboCore.corepdf: 5.0.0 -> 5.0.1 --- pkgs/applications/misc/cubocore-packages/corepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix index c06e01a01729..4474d1531911 100644 --- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corepdf"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "corepdf"; tag = "v${finalAttrs.version}"; - hash = "sha256-fhEuMk15yCA6IUasD9rJPR8sB+h0tz8niOQtXFIe7Uc="; + hash = "sha256-6VLjOf/VZpBH8kIvdvObiyu10yiTYk26eKHFKIUMwN8="; }; nativeBuildInputs = [ From 778489591fbbbba4a96e120d298dc10041336bc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:40:43 +0000 Subject: [PATCH 0100/1079] CuboCore.corerenamer: 5.0.0 -> 5.0.1 --- .../misc/cubocore-packages/corerenamer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix index 4d2b91cee669..a90ab69eba82 100644 --- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corerenamer"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "corerenamer"; tag = "v${finalAttrs.version}"; - hash = "sha256-9e8Gm7h0zWVQeb7eFcUmp8uTdSboenLa7baZpKc3HEQ="; + hash = "sha256-94luETLmugQZuSI+q84DC9WyH5LtCqpjH6LYtv9R93Y="; }; nativeBuildInputs = [ From caa16025efb6da2da3e0a6d95dda9d3e6cf6d3d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:41:07 +0000 Subject: [PATCH 0101/1079] CuboCore.corepins: 5.0.0 -> 5.0.1 --- pkgs/applications/misc/cubocore-packages/corepins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix index 1783c0c5d864..e540c3124bfc 100644 --- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corepins"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "corepins"; tag = "v${finalAttrs.version}"; - hash = "sha256-noMdI2qk3cYc1FfRWd4rwpZBbeHiD557Z1T0ZxIhaTw="; + hash = "sha256-+cWhlqIK2Oqx4Zt1sRd7xvGwmbYOZbMMU+k5uNnkogk="; }; nativeBuildInputs = [ From 978254bdf02f70e81a73c4ff3410419dc8287d87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:42:59 +0000 Subject: [PATCH 0102/1079] CuboCore.corearchiver: 5.0.0 -> 5.0.1 --- .../misc/cubocore-packages/corearchiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index 4de3a74839bc..d9fa21143f13 100644 --- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corearchiver"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "corearchiver"; tag = "v${finalAttrs.version}"; - hash = "sha256-+XaBe1fNpAQf3cqXV+A1cZ1tPck3bCpgEDmFeF536q4="; + hash = "sha256-r2iXvc9KtRsB5IHvJxs/DxQIf7IiNWoM4h2wDgsXvZE="; }; nativeBuildInputs = [ From 96135b3649e65542b27ab76996c5227b1d153d7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:47:49 +0000 Subject: [PATCH 0103/1079] CuboCore.corekeyboard: 5.0.0 -> 5.0.1 --- .../misc/cubocore-packages/corekeyboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index 10a0d0c1d3ef..e41603f9aac7 100644 --- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corekeyboard"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "corekeyboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-n7QbvRPZFMeUl/P4XiGYZDglZCA8Ftf08s5uzPmSyIQ="; + hash = "sha256-HAkIhmQzicnOAws8M+Z8J7lCuGUqYkJeQl0H8P0EE3c="; }; nativeBuildInputs = [ From 50d093faa59782605d98a54c8dee6348d6958c24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:49:49 +0000 Subject: [PATCH 0104/1079] CuboCore.corepad: 5.0.0 -> 5.0.1 --- pkgs/applications/misc/cubocore-packages/corepad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix index 6c77b39025ba..75dfd258add2 100644 --- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corepad"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "corepad"; tag = "v${finalAttrs.version}"; - hash = "sha256-oGF2N0bUuvc/ixmh2nefEJKh0kDipvcL/dwaXNxwo84="; + hash = "sha256-TA/gwI7ukuwChBRp2xsDbNbTblkzYgQ5YHwuI53cxc8="; }; nativeBuildInputs = [ From 55c8a6f521c834ed20a811c80bd9bd779303ccea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:54:09 +0000 Subject: [PATCH 0105/1079] CuboCore.coreimage: 5.0.0 -> 5.0.1 --- .../applications/misc/cubocore-packages/coreimage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 9ebc6457e043..7ecde35724c5 100644 --- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coreimage"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "coreimage"; tag = "v${finalAttrs.version}"; - hash = "sha256-sgOxDKACb9D/TvjjHz09JwBpFoE8eXA4HixcbN+0FoE="; + hash = "sha256-1P6dD0aHsv79s1jCghRhhxi5rZ6MmpyIrks9QnqFoaU="; }; nativeBuildInputs = [ From d5e7489277f53ab9b47e2c1c70525c97f6a45ac8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:54:47 +0000 Subject: [PATCH 0106/1079] CuboCore.corepaint: 5.0.0 -> 5.0.1 --- .../applications/misc/cubocore-packages/corepaint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix index 86d65d6b3a21..cb096b1dc0e7 100644 --- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix +++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corepaint"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "corepaint"; tag = "v${finalAttrs.version}"; - hash = "sha256-ARFyBtkGYFMKnUD1h93GcQiKV6mFXxJvLEVeSXlaHZI="; + hash = "sha256-qk2Fm/IhUU/0y+ErMK/qQKxnD/en14ZKoiIJoJwBnMc="; }; nativeBuildInputs = [ From dd4121aa4dc55f963d0ef37722de835242d02a3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 00:57:59 +0000 Subject: [PATCH 0107/1079] CuboCore.coreaction: 5.0.0 -> 5.0.1 --- .../misc/cubocore-packages/coreaction/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index f9143c5d505d..3040ca370e07 100644 --- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix +++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coreaction"; - version = "5.0.0"; + version = "5.0.1"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = "coreaction"; tag = "v${finalAttrs.version}"; - hash = "sha256-R/pzudaxs85etbI4hh2NwHNtO7EqI+vgJALY/4rIvrs="; + hash = "sha256-93/1emCLXP3hHDGdzjF5horWkpG51yM5p68RUs1yoVg="; }; nativeBuildInputs = [ From 6f5cd1ec38dcf356d61835edb7dcc51b66a65564 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 5 May 2026 23:41:34 +0000 Subject: [PATCH 0108/1079] swim: 0.17.0 -> 0.18.0 Diff: https://gitlab.com/spade-lang/swim/-/compare/v0.17.0...v0.18.0 Changelog: https://gitlab.com/spade-lang/swim/-/blob/v0.18.0/CHANGELOG.md --- pkgs/by-name/sw/swim/package.nix | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/sw/swim/package.nix b/pkgs/by-name/sw/swim/package.nix index 821678b28616..5c5528bc7759 100644 --- a/pkgs/by-name/sw/swim/package.nix +++ b/pkgs/by-name/sw/swim/package.nix @@ -10,25 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "swim"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitLab { owner = "spade-lang"; repo = "swim"; rev = "v${version}"; - hash = "sha256-5GxOW5Np5CS1hO8Bd/CoKuRHMiQ9Q2Xz61NGyXXNF7Q="; + hash = "sha256-l0iEzctt3WHW7m3wnr5WdthqBlGSh0SxHCQlM6it0Ds="; }; - cargoHash = "sha256-TmPw/vP4/LZrBOv1/vJBv3NIn75NnRQmtS4gdmZRH2w="; - - preConfigure = '' - # de-vendor spade git submodule - test "$version" = "${spade.version}" || { - >&2 echo ERROR: version mismatch between spade and swim! - false - } - ln -s ${spade.src} runt/spade - ''; + cargoHash = "sha256-k3sWg/oG5+ckxa10Jt/AncbyoB8kaOcG3xKPg1fl/ME="; nativeBuildInputs = [ pkg-config ]; @@ -36,11 +27,15 @@ rustPlatform.buildRustPackage rec { openssl ]; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ + git + spade + ]; checkFlags = [ - # tries to clone https://gitlab.com/spade-lang/swim-templates + # tries to find git after clearing environ "--skip=init::tests::git_init_then_swim_init_works" + # tries to clone https://gitlab.com/spade-lang/swim-templates "--skip=init::tests::init_board_correctly_sets_project_name" "--skip=init::tests::init_board_creates_required_files" "--skip=plugin::test::deny_changes_to_plugins::edits_are_denied" From ce5e5116a00c234decb2098ddcfa2fa62243ae57 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 6 May 2026 10:32:46 +0200 Subject: [PATCH 0109/1079] zsh-autoenv: set license reason: no license found in source code --- pkgs/by-name/zs/zsh-autoenv/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/zs/zsh-autoenv/package.nix b/pkgs/by-name/zs/zsh-autoenv/package.nix index 63d7bc8b9484..09bdf8afca26 100644 --- a/pkgs/by-name/zs/zsh-autoenv/package.nix +++ b/pkgs/by-name/zs/zsh-autoenv/package.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation { homepage = "https://github.com/Tarrasch/zsh-autoenv"; mainProgram = "zsh-autoenv-share"; platforms = lib.platforms.all; + license = lib.licenses.unfree; }; } From fd66ed2aa99156eeb713ad94cc93d7e89befe0bf Mon Sep 17 00:00:00 2001 From: xmnlz Date: Wed, 29 Apr 2026 01:13:20 +0200 Subject: [PATCH 0110/1079] maintainers: add xmnlz --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/by-name/an/anytype/package.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8adce8dda6ee..a2673a33411b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -29792,6 +29792,12 @@ githubId = 5629059; name = "Xavier Lambein"; }; + xmnlz = { + name = "xmnlz"; + github = "xmnlz"; + githubId = 63904972; + email = "lemmeq9+nixos@gmail.com"; + }; xnaveira = { email = "xnaveira@gmail.com"; github = "xnaveira"; diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 08f946bbeedd..f38501ae555d 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -139,6 +139,7 @@ buildNpmPackage (finalAttrs: { autrimpo adda kira-bruneau + xmnlz ]; platforms = [ "x86_64-linux" From 25b3f18c18a5784245e99660e6052e92d209fcc2 Mon Sep 17 00:00:00 2001 From: xmnlz Date: Wed, 29 Apr 2026 01:28:09 +0200 Subject: [PATCH 0111/1079] anytype: fix desktop entry --- .../an/anytype/0003-remove-desktop-entry.patch | 15 +++++++++++++++ pkgs/by-name/an/anytype/package.nix | 1 + 2 files changed, 16 insertions(+) create mode 100644 pkgs/by-name/an/anytype/0003-remove-desktop-entry.patch diff --git a/pkgs/by-name/an/anytype/0003-remove-desktop-entry.patch b/pkgs/by-name/an/anytype/0003-remove-desktop-entry.patch new file mode 100644 index 000000000000..e772bdff71c6 --- /dev/null +++ b/pkgs/by-name/an/anytype/0003-remove-desktop-entry.patch @@ -0,0 +1,15 @@ +diff --git a/electron/js/util.js b/electron/js/util.js +index da18f41ad0..bb07ec9f21 100644 +--- a/electron/js/util.js ++++ b/electron/js/util.js +@@ -314,7 +314,9 @@ class Util { + if (!is.linux) { + return; + }; +- ++ // NixOS: desktop entries are managed by the package, avoid ++ // writing user-local anytype.desktop which goes stale on updates ++ return; + const { execFile } = require('child_process'); + const home = process.env.HOME || ''; + const dataHome = process.env.XDG_DATA_HOME || path.join(home, '.local', 'share'); diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index f38501ae555d..5179ed28a139 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -57,6 +57,7 @@ buildNpmPackage (finalAttrs: { patches = [ ./0001-feat-update-Disable-auto-checking-for-updates-and-updating-manually.patch ./0002-remove-grpc-devtools.patch + ./0003-remove-desktop-entry.patch ]; buildPhase = '' From 2d0bc09836222fa058beb455b518a568d2e9dc82 Mon Sep 17 00:00:00 2001 From: Wenxuan Shi Date: Wed, 6 May 2026 08:40:13 -0500 Subject: [PATCH 0112/1079] hidden-bar: 1.9 -> 1.10 https://github.com/dwarvesf/hidden/releases/tag/v1.10 Upstream changed the macOS artifact from dmg to zip. --- pkgs/by-name/hi/hidden-bar/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/hi/hidden-bar/package.nix b/pkgs/by-name/hi/hidden-bar/package.nix index d31f06643990..9c988082070b 100644 --- a/pkgs/by-name/hi/hidden-bar/package.nix +++ b/pkgs/by-name/hi/hidden-bar/package.nix @@ -2,16 +2,16 @@ lib, stdenvNoCC, fetchurl, - undmg, + unzip, }: stdenvNoCC.mkDerivation rec { pname = "hidden-bar"; - version = "1.9"; + version = "1.10"; src = fetchurl { - url = "https://github.com/dwarvesf/hidden/releases/download/v${version}/Hidden.Bar.${version}.dmg"; - hash = "sha256-P1SwJPXBxAvBiuvjkBRxAom0fhR+cVYfriKmYcqybQI="; + url = "https://github.com/dwarvesf/hidden/releases/download/v${version}/Hidden-Bar-v${version}-macos.zip"; + hash = "sha256-qKX1KZ/fq1K9/7L1cop21MumkHVOmzsS8nvTjy52wLw="; }; sourceRoot = "."; @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ unzip ]; meta = { description = "Ultra-light MacOS utility that helps hide menu bar icons"; From a95ef697318fb74fdaddc63ee5ac5618eefa8c3c Mon Sep 17 00:00:00 2001 From: Hythera <87016780+Hythera@users.noreply.github.com> Date: Wed, 6 May 2026 16:41:53 +0200 Subject: [PATCH 0113/1079] maintainers: remove mmai --- maintainers/maintainer-list.nix | 6 ------ pkgs/development/python-modules/aioredis/default.nix | 2 +- pkgs/development/python-modules/channels-redis/default.nix | 2 +- .../development/python-modules/django-auth-ldap/default.nix | 2 +- pkgs/development/python-modules/django-cleanup/default.nix | 2 +- .../python-modules/django-dynamic-preferences/default.nix | 2 +- pkgs/development/python-modules/django-filter/default.nix | 2 +- .../python-modules/django-oauth-toolkit/default.nix | 2 +- pkgs/development/python-modules/django-storages/default.nix | 2 +- .../python-modules/django-versatileimagefield/default.nix | 2 +- pkgs/development/python-modules/hiredis/default.nix | 2 +- .../python-modules/persisting-theory/default.nix | 2 +- pkgs/development/python-modules/pymemoize/default.nix | 2 +- .../python-modules/requests-http-signature/default.nix | 2 +- 14 files changed, 13 insertions(+), 19 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a4dd2b16256d..057fba9da3af 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18246,12 +18246,6 @@ githubId = 104795; name = "Marek Mahut"; }; - mmai = { - email = "henri.bourcereau@gmail.com"; - github = "mmai"; - githubId = 117842; - name = "Henri Bourcereau"; - }; mmesch = { github = "MMesch"; githubId = 2597803; diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index 1afc574190f5..3541a6b1f56c 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Asyncio (PEP 3156) Redis client library"; homepage = "https://github.com/aio-libs-abandoned/aioredis-py"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index 4de42e0353eb..ab39ec37cec1 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/django/channels_redis/"; changelog = "https://github.com/django/channels_redis/blob/${src.tag}/CHANGELOG.txt"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index 1ee93ac481c0..e6bd08430a02 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { description = "Django authentication backend that authenticates against an LDAP service"; homepage = "https://github.com/django-auth-ldap/django-auth-ldap"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 877b01d42107..d27ccc6dd8f0 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { homepage = "https://github.com/un1t/django-cleanup"; changelog = "https://github.com/un1t/django-cleanup/blob/${version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index 41ccb31ac174..1035451129f7 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { changelog = "https://github.com/agateblue/django-dynamic-preferences/blob/${version}/HISTORY.rst"; homepage = "https://github.com/agateblue/django-dynamic-preferences"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-filter/default.nix b/pkgs/development/python-modules/django-filter/default.nix index 99308a5f1a3f..e32f81e50407 100644 --- a/pkgs/development/python-modules/django-filter/default.nix +++ b/pkgs/development/python-modules/django-filter/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { homepage = "https://github.com/carltongibson/django-filter"; changelog = "https://github.com/carltongibson/django-filter/blob/${version}/CHANGES.rst"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 9fc17f6116a3..33529c179074 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -64,6 +64,6 @@ buildPythonPackage rec { homepage = "https://github.com/jazzband/django-oauth-toolkit"; changelog = "https://github.com/jazzband/django-oauth-toolkit/django-filer/blob/${version}/CHANGELOG.md"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index b308665b5b7a..566b223a3ebc 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -74,6 +74,6 @@ buildPythonPackage rec { downloadPage = "https://github.com/jschneier/django-storages/"; homepage = "https://django-storages.readthedocs.io"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index 549a21ff2ddd..86de5de3be8e 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Replaces django's ImageField with a more flexible interface"; homepage = "https://github.com/respondcreate/django-versatileimagefield/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index 9f202d21f02c..9ce30aaeb48c 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/redis/hiredis-py"; changelog = "https://github.com/redis/hiredis-py/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/persisting-theory/default.nix b/pkgs/development/python-modules/persisting-theory/default.nix index 5f6ff5f7e7da..cd7ac03fc4bd 100644 --- a/pkgs/development/python-modules/persisting-theory/default.nix +++ b/pkgs/development/python-modules/persisting-theory/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { homepage = "https://code.agate.blue/agate/persisting-theory"; description = "Automate data discovering and access inside a list of packages"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pymemoize/default.nix b/pkgs/development/python-modules/pymemoize/default.nix index 7b1b1a0aee10..2a92209d671b 100644 --- a/pkgs/development/python-modules/pymemoize/default.nix +++ b/pkgs/development/python-modules/pymemoize/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { description = "Simple Python cache and memoizing module"; homepage = "https://github.com/mikeboers/PyMemoize"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/requests-http-signature/default.nix b/pkgs/development/python-modules/requests-http-signature/default.nix index 1a7c3f2c1e51..f28377af0f9e 100644 --- a/pkgs/development/python-modules/requests-http-signature/default.nix +++ b/pkgs/development/python-modules/requests-http-signature/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "Requests authentication module for HTTP Signature"; homepage = "https://github.com/kislyuk/requests-http-signature"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ mmai ]; + maintainers = [ ]; }; } From 257689de3d626085b008ecc0c05d940acf7c4e27 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 6 May 2026 11:48:00 +0200 Subject: [PATCH 0114/1079] mailutils: fix portability issue affecting musl --- pkgs/by-name/ma/mailutils/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ma/mailutils/package.nix b/pkgs/by-name/ma/mailutils/package.nix index 33011d4ddf08..493c25cf05b0 100644 --- a/pkgs/by-name/ma/mailutils/package.nix +++ b/pkgs/by-name/ma/mailutils/package.nix @@ -92,6 +92,12 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.archlinux.org/archlinux/packaging/packages/mailutils/-/raw/87c3614083260f52dd1222e872a1836f0ff9abe1/fix-build.patch"; hash = "sha256-RN62l5mYqtViEjXpAlQKWhFez1TPynRMj/1nvZkq5Gs="; }) + # Fix for non-portable assumptions causing test failures on musl + (fetchpatch { + name = "portability.patch"; + url = "https://cgit.git.savannah.gnu.org/cgit/mailutils.git/patch/?id=6e038f04d575731cf90a44cf0114e485a9827a26"; + hash = "sha256-kamIiQty+/PEB9gC4tPsEMzz1GMGuZAe+DXqjdTeg70="; + }) ]; enableParallelBuilding = true; From 0f857ff930674beaed29b7c1cba597b1278b209b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 20:15:02 +0000 Subject: [PATCH 0115/1079] teams-for-linux: 2.8.1 -> 2.9.0 --- pkgs/by-name/te/teams-for-linux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index b01f5392b4a0..6c03b695a5e4 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -16,16 +16,16 @@ buildNpmPackage rec { pname = "teams-for-linux"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-kD04SMErq92k+F4/3v6bpoJf2lfaGM6bAn+bCa9ACbA="; + hash = "sha256-lJduUoD/bw4cAvk30fmYWsQznAFQOnUiVzIubuN7/Mk="; }; - npmDepsHash = "sha256-497bL7l3OIAgkbXP3FkeFFpPz2VtRENrw6sQmJsnXBY="; + npmDepsHash = "sha256-CxAPb5MXc6auF219Rg0ocfijSY59j7R9lXeFhFglTPI="; nativeBuildInputs = [ makeWrapper From 55216bc8d523bda62d8699d0c6691fa054d22835 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 May 2026 21:11:06 +0000 Subject: [PATCH 0116/1079] apidog: 2.8.26 -> 2.8.27 --- pkgs/by-name/ap/apidog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix index 9f40de3c39b6..2d27ba4157c2 100644 --- a/pkgs/by-name/ap/apidog/package.nix +++ b/pkgs/by-name/ap/apidog/package.nix @@ -7,11 +7,11 @@ let pname = "apidog"; - version = "2.8.26"; + version = "2.8.27"; src = fetchurl { url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage"; - hash = "sha256-u+J5OKgqOKEE35IhMpL7LUB4UgaX2XZKfnUczfLhjoU="; + hash = "sha256-elZR7IhS+0PvcO/WowADjsPyjM0NB+5BCDz7PTA+Lr0="; }; appimageContents = appimageTools.extract { From f069e07d2bff540335b01f31920c54c6877f5e97 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:11 +0300 Subject: [PATCH 0117/1079] discord-canary: 1.0.962 -> 1.0.1033 --- .../instant-messengers/discord/sources.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 2ca81a052f0e..57551f4e5e5d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -1,73 +1,73 @@ { "linux-canary": { "distro": { - "hash": "sha256-4xA+Kh6UiwtoUt5A2kPI5rcbSEc/SoZzJbwFdjMNVpE=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/full.distro" + "hash": "sha256-rZ9gCLa8f0k19Dnvxl+/DbBf7zyDciE0WgBxWKLBzQc=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-3dcVKm/Sz9bqhEm8xVMtRcWrU6JWtv2Dh8oz/3K489E=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_cloudsync/1/full.distro", + "hash": "sha256-/HimiJX86kCnWTPqhvKQnNLFJUmQ7iezvi2n0u/r/Ho=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-7zcFkh3f9BVjHlevCkZXUFNdeLCkM2+sysuSUyPcQlA=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_desktop_core/1/full.distro", + "hash": "sha256-dvzQYjcqPvIGS6OSqNTvaWBUUFtnxfoYq6yLEJUhRts=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-TD1vWHt4y3xkAEc/BV2HZe3tNdP0PTZsXhVeeHvRAU4=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_dispatch/1/full.distro", + "hash": "sha256-dHqfDXW60NektT+Su2KYg4FaqH49ddrCQlncdkAltuo=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-nv6kKT+ZWfwkH4BvOWtjF8VZoznzYRN0hK8kiTbcX/I=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_erlpack/1/full.distro", + "hash": "sha256-1npmkifvbGXFtdajGRKOWI58PHv3UOpmoidgJu+jbtw=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-Ru8zXxDGwHrpMnnraAVR0Z7jRA4PRLHX7pBz8jctar8=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_game_utils/1/full.distro", + "hash": "sha256-rhzTUbNDM9XPWWwOo5hQk12DWcP32KCiMaHPEKtSjac=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-zkhTv+8qzyrZBHpZeCzJX6z8HCK0M4Jt6Kr+InbVT80=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_krisp/1/full.distro", + "hash": "sha256-H87TILw5hKxfuqUAz5f3/XL9NMGAgnpDS6u0x49pkgE=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-j5UE4ZugIF4HTsOgxK3Dfp0WP3Sya1fbDjERxGu2qSM=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_modules/1/full.distro", + "hash": "sha256-y0svIIpZtF8d3L/EAEUCQ99J5p5/zpssXNuzYlJ8N6I=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-HaUt+G05Im2uNkUB9Ry1c6X/iadc7xLrcEgJCVgpgsY=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_rpc/1/full.distro", + "hash": "sha256-telD7FdWiZQQ56fjnZJMSSpxFa3YyWQy2G+OBhuEJ9g=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-8cOwisLqnxGsbqPYStBAaKEaALIM0M5d3RPLtoHxClw=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_spellcheck/1/full.distro", + "hash": "sha256-oZ3H/uFZJybt+ZrRzYzD2tv6rSZwvYjRH3LbhHaz+uA=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-hfQu3fT9ON0j8xEAwCRY7/ALYYq/a70W/8HeT3KhZF0=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_utils/1/full.distro", + "hash": "sha256-4sLz1RBus6BWq7Eb+Tf0XBy0QDFRfe5Mr3Zb4IwDbt0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-JJXt5wHat6AtxW1GIzsPnMHJPzX1DlPgB3kDcg9Bnts=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_voice/1/full.distro", + "hash": "sha256-su7qGFOH1fL/zkqbE97NDlSrxRX1aWWT/sfehCIZIvM=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-PMlqdAI44AngVh75Eq66zHLEoJkI0262FcFUffPykCk=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_zstd/1/full.distro", + "hash": "sha256-Z8hxOdCKyJGt3DBAQ+mkKf37LcQrdkyV79dmgD272Qs=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.962" + "version": "1.0.1033" }, "linux-development": { "distro": { From b45dc30858ce125bb5ba6d117a2072df10783909 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:13 +0300 Subject: [PATCH 0118/1079] discord-development: 1.0.976 -> 1.0.980 --- .../instant-messengers/discord/sources.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 57551f4e5e5d..86bb1774de2e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -71,73 +71,73 @@ }, "linux-development": { "distro": { - "hash": "sha256-6MLiRO2GYXkBRQjzOwmKHVqMqGsVjk0E3ocvdYyg8qs=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/full.distro" + "hash": "sha256-d7G9+oIKiao7uRL8gsRk2LxzAG5I2J6BcyCPXMOeHw8=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-6yEFPNHqs5Mk+1V2x4R/ZwFgwb2Z+O9iOrX78/G3ynM=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_cloudsync/1/full.distro", + "hash": "sha256-YUa4415UU7/ZqxkOJfbxcoakgWXNj7ilGkKSeK8PkcY=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-Z82Y9I4brUOvGiZhgL5V+wXRFfDH/XazWJG3OMYyo3s=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_desktop_core/1/full.distro", + "hash": "sha256-pBEVWEKZjAf5SBYeQkO8WUkvFHZ7MyVOmxmX9EveCM0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-MTjgc8SfL7i4O+QkYQu0Os04iAM1x85AAZxuooI5Oog=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_dispatch/1/full.distro", + "hash": "sha256-oRgIGU86rvW6QVF7WCxFC7aVcYTuIw4JTtVKP55Rse8=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-JQAgkIpev2+1dlfPW/bg/Iek/cL3+V92IpZIa8e+Fp8=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_erlpack/1/full.distro", + "hash": "sha256-SJzSCh4NVt8U1ebt0zSvoquk1FCbyMeHKSxFLlIt0L0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-ixKdUlXhDVmk3P41gFixSpPJCMnd3c/yLQF1J7DYI+M=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_game_utils/1/full.distro", + "hash": "sha256-OM2v5ps8X8h4UG9NOLRFgEm+BVnrEufhOYETYDD9HQQ=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-UJmBXQm0SXbCOjtJN72BZJCViULhpJgc0rgqDrhhNR0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_krisp/1/full.distro", + "hash": "sha256-dLLnwg82KPtDM0VI7xG2S/DF5t9nziB6LQennSpqsOo=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-+TH9x91upIuX9nwvpF9pX4w58YRqu6+hbF1RSyiykdM=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_modules/1/full.distro", + "hash": "sha256-gdH5vvVhTkdE0uMDaoN+3AJTMDe9dfILcUHjSHlwBEk=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-cGK1qN8jUiw2l9KNbb7eucWWPw191AHzh/4C6T8gI44=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_rpc/1/full.distro", + "hash": "sha256-ZzOiBXsAJhpevHteLRUvUzRKpCtGvv69voi2RCar7YE=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-b/X24WJi2Mi0x7Ynqphmtr6FSYUMSR9dDPPUF/k/TN8=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_spellcheck/1/full.distro", + "hash": "sha256-FUcWLGRwAXuf9QyGtJwneOCF/S6FWjCtS4b1P5g3eaI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-+dslIrgHH5r7sz95Ixb+5DDOQA8PEr4BcqkJTchf3WQ=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_utils/1/full.distro", + "hash": "sha256-8evbMbvbKDoaL/Q2JebHQCSgcMkfhan1b3eEpYU9gPI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-7rg5Ct/BPJaOak0HOeTuYMbfdhHBvI4qML1nnYzZ+IE=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_voice/1/full.distro", + "hash": "sha256-HZoqUGlUySWHzBS0fOrM98ycW62n8xTAqn/KeQ1A4tc=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-XKJNd/9l3PJX1GTHT0hvsB9pqI6oDkAvay2L3bOIk/0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_zstd/1/full.distro", + "hash": "sha256-iFvOlG14dVyDkF9c8q4L8JnxtGNiZCRjy09Lt5FJj/w=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.976" + "version": "1.0.980" }, "linux-ptb": { "distro": { From a7c378c095f4f13bd1be524c4f668dd95e60259b Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:14 +0300 Subject: [PATCH 0119/1079] discord-ptb: 1.0.188 -> 1.0.189 --- .../instant-messengers/discord/sources.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 86bb1774de2e..7474e32edd6c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -141,73 +141,73 @@ }, "linux-ptb": { "distro": { - "hash": "sha256-dVLGOL//a1mCw0NyekrCemfu9u7pA9t1+UnQ8zmMCwI=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/full.distro" + "hash": "sha256-rPe3N7n3QkYa+pS4ZKRfeCnhK/MnkNrJIhr51XPY9XE=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-cLqmwjFWUnRnBY3iEqpyv2mtuHI4TanGxbI1cT4V9Ic=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_cloudsync/1/full.distro", + "hash": "sha256-T/SapvIHT7X8FFgMolRfcgKe6cL3ldQX4goiWlWaW3Q=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-UmAYyAVVwVZINIobQejXSEK01C/oQJBjxBQ1p45AMOg=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_desktop_core/1/full.distro", + "hash": "sha256-e4GrIxx0KpQ9qAx4O4rO8jPV17U7XxtRY5Ox72SSmgg=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-/WfqrWgqCXSUodMqlhgiHTQAiRSfg1dfA4c3CxKZuJk=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_dispatch/1/full.distro", + "hash": "sha256-gZoKMgS/0c0llQWPIc0PmJiqzoV75hdJ6pw3whsmrwU=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-MXBUoaeC1Refb80mqyZQ6vE8lRV04K5yZbhHMN5XuTY=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_erlpack/1/full.distro", + "hash": "sha256-l8xKWZ8kNI6gdiMzEAh0CGAM6Xa1w0Py7znGElZT+a4=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-P4s5/5aeLjzaD0HwHlpHCWaiVlsq+TFlfEqfCym4rH0=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_game_utils/1/full.distro", + "hash": "sha256-cacgFbMHO5HCiwpOCyrB39FVqLFZ7tP1Pp0wr8Q3C80=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-hwLHumM78aJv/OSX1LAxqpUGZmiVWGg2Sc6SmOdg+Oc=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_krisp/1/full.distro", + "hash": "sha256-621qH2NG4tkligBd4253HFIZiNefxAeQqYrSmjYG6v8=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-UGS9Znl5QWiQ5nG2I2GxUmQ3sRaaXcCyPPzh3AjAyQA=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_modules/1/full.distro", + "hash": "sha256-xEVg3yscqnLzK3sQdzbmDDG0vFVWxabjyAHRQf5t0pY=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-izqFS9ePjv+4VTqrrnwdlNCdpQik5Y7D3pmznP74ULA=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_rpc/1/full.distro", + "hash": "sha256-p20egYYvTbGGmZD0bF8MqK2wDa5tWKpf/zFX4HfSZ9U=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-ykwur5DajvoAvNyhTb3wbtduv2NgLhrEEKKI2O/CqC8=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_spellcheck/1/full.distro", + "hash": "sha256-7p/cTlPCyFmoA6MiSsxDsbPeUCm32h+UdHBhQafHpk0=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-HKHbGqYK8AyJu+PnVaZIv+HJr6pc6LtnnXI29rSFPmI=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_utils/1/full.distro", + "hash": "sha256-WoDot6uM79syGwfaYLdV70zYMKJYLQXcWhddf6rg0mk=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-HL/eZQpc0r+5N7LBFZdUVZWQT4nUtX3gBZlOPR1pLfs=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_voice/1/full.distro", + "hash": "sha256-HHOoCOSzfa/EpFPmi7rSluI2iF7YCAxhuN4QMNTCfEg=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-P/8cVdak4Sz7SfHzi8DJPgZi9LRu6FWWI9hjoe8LY8o=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_zstd/1/full.distro", + "hash": "sha256-le4KCmo2owtka6k/KGIkE8mntYZQIkfmgpSHgBRFq0c=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.188" + "version": "1.0.189" }, "linux-stable": { "hash": "sha256-N4gdcj8LYiXxvkbZhZyiWr375vaXt6JnwcoqLOKMsGg=", From 48dd7b3c34fff167391ced88bc97a1b66e7cd353 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:15 +0300 Subject: [PATCH 0120/1079] discord: 0.0.134 -> 0.0.135 --- .../networking/instant-messengers/discord/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 7474e32edd6c..5e75bae0683a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -210,10 +210,10 @@ "version": "1.0.189" }, "linux-stable": { - "hash": "sha256-N4gdcj8LYiXxvkbZhZyiWr375vaXt6JnwcoqLOKMsGg=", + "hash": "sha256-vMuoz1OR0cKvrfT/ilkNXEtEP3zEwyNGh6AW5iQADws=", "kind": "legacy", - "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.134/discord-0.0.134.tar.gz", - "version": "0.0.134" + "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.135/discord-0.0.135.tar.gz", + "version": "0.0.135" }, "osx-canary": { "hash": "sha256-tR52aLUTW5iLzOQnXVS6muqsu44rXplHeXNKsR3u4Sw=", From 0f6c97b536c10d40518fb2dbc28e5b747f137374 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 14:21:57 +0300 Subject: [PATCH 0121/1079] discord: update distro source generation --- .../instant-messengers/discord/update.py | 91 ++++--------------- 1 file changed, 16 insertions(+), 75 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/update.py b/pkgs/applications/networking/instant-messengers/discord/update.py index 49f90ca9e1c5..71dd5b665907 100755 --- a/pkgs/applications/networking/instant-messengers/discord/update.py +++ b/pkgs/applications/networking/instant-messengers/discord/update.py @@ -4,28 +4,16 @@ from dataclasses import asdict, dataclass, field from enum import StrEnum from typing import List -from subprocess import PIPE, Popen +import base64 import json import urllib.request -import re import os.path -SRC_NAME = "source" - -VERSION_REGEX = re.compile(r"\/([\d.]+)\/") - class Platform(StrEnum): LINUX = "linux" MACOS = "osx" - def format_type(self): - if self.value == Platform.LINUX.value: - return "tar.gz" - elif self.value == Platform.MACOS.value: - return "dmg" - raise RuntimeError("Invalid platform") - class Branch(StrEnum): STABLE = "stable" @@ -35,8 +23,6 @@ class Branch(StrEnum): class Kind(StrEnum): - # Single tarball or dmg fetched via discord.com/api/download redirect - LEGACY = "legacy" # Brotli-compressed host + module distros from the distributions API DISTRO = "distro" @@ -57,50 +43,10 @@ def serialize_variant(variant: Variant) -> str: return f"{variant.platform}-{variant.branch}" -def url_for_variant(variant: Variant) -> str: - return f"https://discord.com/api/download/{variant.branch.value}?platform={variant.platform.value}&format={variant.platform.format_type()}" - - def distro_manifest_url_for_variant(variant: Variant) -> str: return f"https://updates.discord.com/distributions/app/manifests/latest?channel={variant.branch.value}&platform={variant.platform.value}&arch=x64" -def fetch_redirect_url(url: str) -> str: - headers = {"user-agent": "Nixpkgs-Discord-Update-Script/0.0.0"} - # note that urllib follows redirects by default. So we can extract the final url from the response object - req = urllib.request.Request(url, headers=headers) - with urllib.request.urlopen(req) as response: - return response.url - - -def version_from_url(url: str) -> str: - matches = VERSION_REGEX.search(url) - assert matches, f"Url {url} must contain version number" - version = matches.group(1) - assert version - return version - - -def prefetch(url: str) -> str: - with Popen(["nix-prefetch-url", "--name", "source", url], stdout=PIPE) as p: - assert p.stdout - b32_hash = p.stdout.read().decode("utf-8").strip() - with Popen( - ["nix-hash", "--to-sri", "--type", "sha256", b32_hash], stdout=PIPE - ) as p: - assert p.stdout - sri_hash = p.stdout.read().decode("utf-8").strip() - return sri_hash - - -@dataclass -class LegacySource: - version: str - url: str - hash: str - kind: Kind = Kind.LEGACY - - @dataclass class DistroRef: url: str @@ -133,6 +79,10 @@ def version_triple_to_str(triple: list) -> str: return ".".join(str(x) for x in triple) +def sri_from_sha256_hex(hex_hash: str) -> str: + return "sha256-" + base64.b64encode(bytes.fromhex(hex_hash)).decode("utf-8") + + def fetch_distro_source(variant: Variant) -> DistroSource: manifest = fetch_distro_manifest(variant) @@ -141,46 +91,37 @@ def fetch_distro_source(variant: Variant) -> DistroSource: name: DistroModule( version=mod["full"]["module_version"], url=mod["full"]["url"], - hash=prefetch(mod["full"]["url"]), + hash=sri_from_sha256_hex(mod["full"]["package_sha256"]), ) for name, mod in manifest["modules"].items() } return DistroSource( version=version_triple_to_str(manifest["full"]["host_version"]), - distro=DistroRef(url=distro_url, hash=prefetch(distro_url)), + distro=DistroRef( + url=distro_url, + hash=sri_from_sha256_hex(manifest["full"]["package_sha256"]), + ), modules=modules, ) -def fetch_legacy_source(variant: Variant) -> LegacySource: - url = fetch_redirect_url(url_for_variant(variant)) - return LegacySource( - version=version_from_url(url), - url=url, - hash=prefetch(url), - ) - - def main(): variants: List[Variant] = [ - Variant(Platform.LINUX, Branch.STABLE, Kind.LEGACY), + Variant(Platform.LINUX, Branch.STABLE, Kind.DISTRO), Variant(Platform.LINUX, Branch.PTB, Kind.DISTRO), Variant(Platform.LINUX, Branch.CANARY, Kind.DISTRO), Variant(Platform.LINUX, Branch.DEVELOPMENT, Kind.DISTRO), - Variant(Platform.MACOS, Branch.STABLE, Kind.LEGACY), - Variant(Platform.MACOS, Branch.PTB, Kind.LEGACY), - Variant(Platform.MACOS, Branch.CANARY, Kind.LEGACY), - Variant(Platform.MACOS, Branch.DEVELOPMENT, Kind.LEGACY), + Variant(Platform.MACOS, Branch.STABLE, Kind.DISTRO), + Variant(Platform.MACOS, Branch.PTB, Kind.DISTRO), + Variant(Platform.MACOS, Branch.CANARY, Kind.DISTRO), + Variant(Platform.MACOS, Branch.DEVELOPMENT, Kind.DISTRO), ] sources = {} for v in variants: - source = ( - fetch_distro_source(v) if v.kind == Kind.DISTRO else fetch_legacy_source(v) - ) - sources[serialize_variant(v)] = asdict(source) + sources[serialize_variant(v)] = asdict(fetch_distro_source(v)) with open(os.path.join(os.path.dirname(__file__), "sources.json"), "w") as f: json.dump(sources, f, indent=2, sort_keys=True) From fda82730c08c4dc68f53917f8530a635aae60279 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:16 +0300 Subject: [PATCH 0122/1079] discord-canary: 0.0.1088 -> 0.0.1102 --- .../instant-messengers/discord/sources.json | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 5e75bae0683a..2f9f8f7fc456 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -216,10 +216,94 @@ "version": "0.0.135" }, "osx-canary": { - "hash": "sha256-tR52aLUTW5iLzOQnXVS6muqsu44rXplHeXNKsR3u4Sw=", - "kind": "legacy", - "url": "https://canary.dl2.discordapp.net/apps/osx/0.0.1088/DiscordCanary.dmg", - "version": "0.0.1088" + "distro": { + "hash": "sha256-wQlaOR2PYbfKl4b6kVeM1Uy8dkgXMYUUcl20lAD0xSQ=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/full.distro" + }, + "kind": "distro", + "modules": { + "discord_cloudsync": { + "hash": "sha256-CrGlifM5ueOBujGd/QOJnvDYMwJaldMqS5BVxLYuyyM=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_cloudsync/1/full.distro", + "version": 1 + }, + "discord_desktop_core": { + "hash": "sha256-6d3A2/BZxN6Zj0G1g+IP0gtqRlxUhs9LZ9lvZIY2a9A=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_desktop_core/1/full.distro", + "version": 1 + }, + "discord_dispatch": { + "hash": "sha256-heZgQ4S8Adc4avG2mynZOGe6yf5TELJyZB6WK8Y/ZmY=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_dispatch/1/full.distro", + "version": 1 + }, + "discord_erlpack": { + "hash": "sha256-As8c8MJ7/cGpUD+vTwTSXhFLlmMLdfpj9HkPxj8vDRk=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_erlpack/1/full.distro", + "version": 1 + }, + "discord_game_utils": { + "hash": "sha256-wa7oeH1lh/wC9N8LUYFhns5J4wEzG60LH+cbJnvRhD0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_game_utils/1/full.distro", + "version": 1 + }, + "discord_intents": { + "hash": "sha256-2aiIIKV2x60aBDbtnjPzWHINtOCiLvpGSPakSv1ljCU=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_intents/1/full.distro", + "version": 1 + }, + "discord_krisp": { + "hash": "sha256-wfB8/FEDm9NLEZsPmOckGY7KW6pv2GECIvyCHumJF9w=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_krisp/2/full.distro", + "version": 2 + }, + "discord_ml": { + "hash": "sha256-Ha32zoNYXG/j8tvW1EKWXi0aNXKNsDgu8QVdyCSgrXk=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_ml/1/full.distro", + "version": 1 + }, + "discord_modules": { + "hash": "sha256-p8TsMEBjLr32FhoySty10Y8gk+23buKbf2rW/CUZa0o=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_modules/1/full.distro", + "version": 1 + }, + "discord_notifications": { + "hash": "sha256-c0UNFWEKjwP8SJsARnXMuwZgCRAVUcxtOZSPz3KbAqY=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_notifications/1/full.distro", + "version": 1 + }, + "discord_rpc": { + "hash": "sha256-pLbJODfGx51Ysp58S7aIdZhIvi6an0+BPqHkuYXOvDM=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_rpc/1/full.distro", + "version": 1 + }, + "discord_spellcheck": { + "hash": "sha256-TiXMgJ2tLVKEKQFtJ2DG4/pvDDWfGJZo0wiZ8hP37yc=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_spellcheck/1/full.distro", + "version": 1 + }, + "discord_utils": { + "hash": "sha256-vkPu6xaH6uZXummgs1zl9k8S5roMJi4BfXI/GxzaJJw=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_utils/1/full.distro", + "version": 1 + }, + "discord_voice": { + "hash": "sha256-+8itKyOGtocpt3pUE/qwsemZmUpqZ4jrkjrDzAygi5Q=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_voice/4/full.distro", + "version": 4 + }, + "discord_webauthn": { + "hash": "sha256-bKVnWFyBTwTAbYZNb2OvOXEZZsqrjM2pAC/9LflNW7M=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_webauthn/1/full.distro", + "version": 1 + }, + "discord_zstd": { + "hash": "sha256-VDckm6+FUaa5OidWc9L0jfP93p/siSOtoFbTnB9sRh0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_zstd/1/full.distro", + "version": 1 + } + }, + "version": "0.0.1102" }, "osx-development": { "hash": "sha256-gyZ2H9dsGYRlkPtRSE7hwRfFl6sr4pK2kB6Jq/51dhE=", From 19aa7391cae79ed6b97917f5f331ddee0fc476cb Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:17 +0300 Subject: [PATCH 0123/1079] discord-development: 1.0.982 -> 1.0.987 --- .../instant-messengers/discord/sources.json | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 2f9f8f7fc456..c91a79872ab5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -306,10 +306,94 @@ "version": "0.0.1102" }, "osx-development": { - "hash": "sha256-gyZ2H9dsGYRlkPtRSE7hwRfFl6sr4pK2kB6Jq/51dhE=", - "kind": "legacy", - "url": "https://development.dl2.discordapp.net/apps/osx/1.0.982/DiscordDevelopment.dmg", - "version": "1.0.982" + "distro": { + "hash": "sha256-KuvWcUPFXfj4QW3K8IGS8E0BiffEEMknncjxbMCkvTI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/full.distro" + }, + "kind": "distro", + "modules": { + "discord_cloudsync": { + "hash": "sha256-vX0ZzFkcIJGlZ6CVixrc1U1LGDAszZhexXSWFtbSVpk=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_cloudsync/1/full.distro", + "version": 1 + }, + "discord_desktop_core": { + "hash": "sha256-m/+55zUpSXI/nwZKMaIknAzDsYlnCIcxyGoSeLafDEM=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_desktop_core/1/full.distro", + "version": 1 + }, + "discord_dispatch": { + "hash": "sha256-vvofUseRpHi4wMMbOaM2mI8eYYrwlI1F6dfKyZX8jvU=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_dispatch/1/full.distro", + "version": 1 + }, + "discord_erlpack": { + "hash": "sha256-D9/lpVfwXKj26dMrreSLBPaND/4iCMmC9/u3+T1NVPE=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_erlpack/1/full.distro", + "version": 1 + }, + "discord_game_utils": { + "hash": "sha256-vsAIH6YnxbXAiDqDeeLSuinZLmLn+3D6mbdRJb5L99Y=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_game_utils/1/full.distro", + "version": 1 + }, + "discord_intents": { + "hash": "sha256-1JO4nwtiduv+JZqoPparHV1dgjPVKhYeWzDzuUzWTTs=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_intents/1/full.distro", + "version": 1 + }, + "discord_krisp": { + "hash": "sha256-1oO+B/78bZhlQfRl1V1PHH9zMWJb+2mi2DlVK3NCmVk=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_krisp/1/full.distro", + "version": 1 + }, + "discord_ml": { + "hash": "sha256-RunRar9d7lbF9PkOmQwokmjgfFblc0u4pu2gQGtrc/E=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_ml/1/full.distro", + "version": 1 + }, + "discord_modules": { + "hash": "sha256-vkz0ZWMFFatdrMgEWM16AMuWSaFSI+HFFzq3oP+3dJ4=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_modules/1/full.distro", + "version": 1 + }, + "discord_notifications": { + "hash": "sha256-/h00K6D/bZBwea852GO+4+1w4oLDFQP7OlrTsupBcwc=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_notifications/1/full.distro", + "version": 1 + }, + "discord_rpc": { + "hash": "sha256-3f7O1xyYd4XdOe4+RU1o6TCcwYA8VK4oC6/zlQHIWBE=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_rpc/1/full.distro", + "version": 1 + }, + "discord_spellcheck": { + "hash": "sha256-j+rwWr+pq+Cg3NaaF8EoO31lUDt7Za6h/M033CJjaxQ=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_spellcheck/1/full.distro", + "version": 1 + }, + "discord_utils": { + "hash": "sha256-nXryRxbYrJ1cO+wXGfu52oWPIxj5Efs6J4EQqeronrI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_utils/1/full.distro", + "version": 1 + }, + "discord_voice": { + "hash": "sha256-sEtDXKyrA5Y2yuHzHX06LJUx4zibt2tlZtXmVohyL6c=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_voice/1/full.distro", + "version": 1 + }, + "discord_webauthn": { + "hash": "sha256-kFfptFhrbFkluiBmupcXasbSlq9ygbWkH9S4wTbG0rs=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_webauthn/1/full.distro", + "version": 1 + }, + "discord_zstd": { + "hash": "sha256-2TuxeigNLFPe70njbSaBSmzHsTjb369o7mSxC9XpKVk=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_zstd/1/full.distro", + "version": 1 + } + }, + "version": "1.0.987" }, "osx-ptb": { "hash": "sha256-WlygpcUv+CrmQdZyZ0t3EEb58oopHetbKQbKsLUdI1w=", From b851333c77487f0e6a680bc0305d4b321b4ca0df Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:18 +0300 Subject: [PATCH 0124/1079] discord-ptb: 0.0.231 -> 0.0.232 --- .../instant-messengers/discord/sources.json | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index c91a79872ab5..e8f89ed9d3c6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -396,10 +396,94 @@ "version": "1.0.987" }, "osx-ptb": { - "hash": "sha256-WlygpcUv+CrmQdZyZ0t3EEb58oopHetbKQbKsLUdI1w=", - "kind": "legacy", - "url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.231/DiscordPTB.dmg", - "version": "0.0.231" + "distro": { + "hash": "sha256-LWvTisilV3o7ndSkJylscpjRk/8e6HOG+sEqwss1Xz0=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/full.distro" + }, + "kind": "distro", + "modules": { + "discord_cloudsync": { + "hash": "sha256-0TatK0N39jOtnuNPrZqIVvYRBkgieuWLGUnVffNfvIo=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_cloudsync/1/full.distro", + "version": 1 + }, + "discord_desktop_core": { + "hash": "sha256-mtx5lpSiz/Yw3WfyaHYhetFcTrwH2xtm++23Yp8Zt3g=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_desktop_core/1/full.distro", + "version": 1 + }, + "discord_dispatch": { + "hash": "sha256-8RcoOm4kw1nZaT3q4YY2SpsMOWojSVRuYA5xOJ8EaUE=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_dispatch/1/full.distro", + "version": 1 + }, + "discord_erlpack": { + "hash": "sha256-8TDGUAxW5WortWglbmTz3nNWW0WoYL7GPjvgWX2pmoU=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_erlpack/1/full.distro", + "version": 1 + }, + "discord_game_utils": { + "hash": "sha256-UC5CZ8p3WCEqMmmCD42jiG/7bYEz4rzBX7MDoHHz6Cw=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_game_utils/1/full.distro", + "version": 1 + }, + "discord_intents": { + "hash": "sha256-xlJ4Y/JtIMNTlUk1kIBvZDBwlzWh5VSNvR4XdrX6k4s=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_intents/1/full.distro", + "version": 1 + }, + "discord_krisp": { + "hash": "sha256-60GGDVDSWtWanNt0mI7YknvMp0MTt1G3UFgYqiS3GjM=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_krisp/1/full.distro", + "version": 1 + }, + "discord_ml": { + "hash": "sha256-6Ok4E72wvwBQksVWlN/Jg4b9ejF1AUT8fCT1asiKeMM=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_ml/1/full.distro", + "version": 1 + }, + "discord_modules": { + "hash": "sha256-JVWqNae2VkLcvZ0y95vhNwgohntziiNy0B+7ILvFu/A=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_modules/1/full.distro", + "version": 1 + }, + "discord_notifications": { + "hash": "sha256-S9bZdYqI3I7dx2oSIokigivjNy6ftLgm63y+F2u717w=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_notifications/1/full.distro", + "version": 1 + }, + "discord_rpc": { + "hash": "sha256-FGjHeX1p+TP+o74aVCqqO1LLhcxYwNBpaNa5SkRmbRo=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_rpc/1/full.distro", + "version": 1 + }, + "discord_spellcheck": { + "hash": "sha256-Lu+cE+Ypla7d2yu26dEkg6lUvkqhc49ZilYCNM33GWw=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_spellcheck/1/full.distro", + "version": 1 + }, + "discord_utils": { + "hash": "sha256-36eRP9D1M62vivqUBmT8Q69MV223M1tOmVCAoIyUE7o=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_utils/1/full.distro", + "version": 1 + }, + "discord_voice": { + "hash": "sha256-HH4hoDBaWVPHSoSnUz3D+TS3unVFSS2cCZZ8QUKudE0=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_voice/1/full.distro", + "version": 1 + }, + "discord_webauthn": { + "hash": "sha256-hWsS4gNEC+y5RWhw6yb3JzSydSFLvpZEAeS2OTTlt1o=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_webauthn/1/full.distro", + "version": 1 + }, + "discord_zstd": { + "hash": "sha256-tgFVUfraQfI5M/5WTTU6TrvysQPuqHAhiQSo6BzSkp4=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_zstd/1/full.distro", + "version": 1 + } + }, + "version": "0.0.232" }, "osx-stable": { "hash": "sha256-H+Odwt2Ry3C1+OMhVdr9PjAXOnI8vmsUkSBL8dieakc=", From b7c15d7f2e30e0db5549f1deb97eb2519fde1233 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:20 +0300 Subject: [PATCH 0125/1079] discord: 0.0.387 -> 0.0.389 --- .../instant-messengers/discord/sources.json | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index e8f89ed9d3c6..75b84c0d4e7d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -486,9 +486,93 @@ "version": "0.0.232" }, "osx-stable": { - "hash": "sha256-H+Odwt2Ry3C1+OMhVdr9PjAXOnI8vmsUkSBL8dieakc=", - "kind": "legacy", - "url": "https://stable.dl2.discordapp.net/apps/osx/0.0.387/Discord.dmg", - "version": "0.0.387" + "distro": { + "hash": "sha256-G5Ji8fsStgyhwx2XY+l5WUb9cMtIENAKv5k52s2g/3g=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/full.distro" + }, + "kind": "distro", + "modules": { + "discord_cloudsync": { + "hash": "sha256-yGdWuaJplBkwUoLwd5uJFIWFF2XjyOwOWY3SJdmx1q0=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_cloudsync/1/full.distro", + "version": 1 + }, + "discord_desktop_core": { + "hash": "sha256-97utI2ZNnFOCMxJHc7RRoXxZ2GzdFs8ll+N0Imr/LNM=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_desktop_core/1/full.distro", + "version": 1 + }, + "discord_dispatch": { + "hash": "sha256-XwABjhRMMDKQsmHGeyzRveAxwJJWSIMIJoF8nJQ7SzA=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_dispatch/1/full.distro", + "version": 1 + }, + "discord_erlpack": { + "hash": "sha256-4nz4TeACvEdhKZzlTMuSKN1uf9LWqm+ro4Gx/kt41Mg=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_erlpack/1/full.distro", + "version": 1 + }, + "discord_game_utils": { + "hash": "sha256-wKF4difrMuX8m5NsUUVK9sdsBKiTQG1B+ckrBW6LTZQ=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_game_utils/1/full.distro", + "version": 1 + }, + "discord_intents": { + "hash": "sha256-MHj9MtTcxFs3h2P5MfI/i8f2I64oZ2fKt+ByJPlVMLc=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_intents/1/full.distro", + "version": 1 + }, + "discord_krisp": { + "hash": "sha256-XCCBJer4RPs/Nk+YKTH1BAVxSFu1XAJNeb5ai4uFaKU=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_krisp/1/full.distro", + "version": 1 + }, + "discord_ml": { + "hash": "sha256-U1sRjCzeLFg7j/MR6AsC76Ib6ULXs/RqN6FSB3IzCdc=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_ml/1/full.distro", + "version": 1 + }, + "discord_modules": { + "hash": "sha256-IElPJUwEz2QL0WDWCju8JR7Z81X3t92JHEXhs8NUF8k=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_modules/1/full.distro", + "version": 1 + }, + "discord_notifications": { + "hash": "sha256-0+XuBfb0lhx3YUAqRRBEAHqDQJa2/8ebcZhnh821ltE=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_notifications/1/full.distro", + "version": 1 + }, + "discord_rpc": { + "hash": "sha256-i0tChHCi1aSAXsieRg/rxKptU8R3zI3Wxmdxi1Til2s=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_rpc/1/full.distro", + "version": 1 + }, + "discord_spellcheck": { + "hash": "sha256-MsSCA7Jdk+MeMpsFYcUSmGNbmfnZrTy3LbSUI7e9yOo=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_spellcheck/1/full.distro", + "version": 1 + }, + "discord_utils": { + "hash": "sha256-2YStzx57sx666H/CTIvmdgTWw+tJOgICx8sY0zVERak=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_utils/1/full.distro", + "version": 1 + }, + "discord_voice": { + "hash": "sha256-Tag4GSeN+1Y/LK69R4HOxMlFDE9BUg4/EcEDFVXI5Bk=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_voice/1/full.distro", + "version": 1 + }, + "discord_webauthn": { + "hash": "sha256-ouEP2+k2xZpMxaLD6RiloL94faW4WsVcMFxWYTy7OW4=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_webauthn/1/full.distro", + "version": 1 + }, + "discord_zstd": { + "hash": "sha256-zUyoJ3i1iYmBCRm6uFTo8QUKly3uDzL4xqebWQ7LH4k=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_zstd/1/full.distro", + "version": 1 + } + }, + "version": "0.0.389" } } From 2a82a95464b9aae569a39e9018cf12e25b3d9fc3 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 14:21:57 +0300 Subject: [PATCH 0126/1079] discord: use distro layout on Darwin --- .../instant-messengers/discord/darwin.nix | 72 +++++++++++++++++-- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index aabb23a155a1..b8ff915a0ff0 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -8,9 +8,10 @@ self, lib, fetchurl, - undmg, makeWrapper, writeScript, + writeShellScript, + brotli, python3, runCommand, branch, @@ -34,7 +35,45 @@ let enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods); inherit (source) version; - src = fetchurl { inherit (source) url hash; }; + + src = fetchurl { inherit (source.distro) url hash; }; + + moduleSrcs = lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules; + + moduleVersions = lib.mapAttrs (_: mod: mod.version) source.modules; + + configDirName = lib.replaceStrings [ " " ] [ "" ] (lib.toLower binaryName); + + fixDistroSymlinks = writeScript "discord-fix-distro-symlinks.py" '' + #!${python3.interpreter} + import pathlib + import sys + import tarfile + + with tarfile.open(sys.argv[1]) as tar: + for member in tar: + if not member.issym(): + continue + parts = pathlib.PurePosixPath(member.name).parts[1:] + if not parts: + continue + path = pathlib.Path(sys.argv[2], *parts) + path.unlink(missing_ok=True) + path.symlink_to(member.linkname) + ''; + + stageModules = writeShellScript "discord-stage-modules" '' + store_modules="$1" + modules_dir="$HOME/Library/Application Support/${configDirName}/${version}/modules" + if [ ! -f "$modules_dir/installed.json" ]; then + mkdir -p "$modules_dir" + for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do + ln -sfn "$store_modules/$m" "$modules_dir/$m" + done + echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \ + > "$modules_dir/installed.json" + fi + ''; disableBreakingUpdates = runCommand "disable-breaking-updates.py" @@ -62,22 +101,47 @@ stdenv.mkDerivation { ; nativeBuildInputs = [ - undmg + brotli makeWrapper ]; sourceRoot = "."; + dontUnpack = true; + installPhase = '' runHook preInstall mkdir -p $out/Applications - cp -r "${desktopName}.app" $out/Applications + + extractDistro() { + local src="$1" + local dest="$2" + local tarball + tarball=$(mktemp) + brotli -d < "$src" > "$tarball" + tar xf "$tarball" --strip-components=1 -C "$dest" + + # Discord's distro tarballs store symlinks with mode 000, which makes + # them unreadable on Darwin. Recreate them with normal permissions. + ${fixDistroSymlinks} "$tarball" "$dest" + rm "$tarball" + } + + extractDistro "$src" "$out/Applications" + + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: src: '' + mkdir -p "$out/Applications/${desktopName}.app/Contents/Resources/modules/${name}" + extractDistro ${src} "$out/Applications/${desktopName}.app/Contents/Resources/modules/${name}" + '') moduleSrcs + )} # wrap executable to $out/bin mkdir -p $out/bin makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}" \ --run ${lib.getExe disableBreakingUpdates} \ + --run "${stageModules} $out/Applications/${desktopName}.app/Contents/Resources/modules" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall From b49b623ae22c544c250e891d3fdbec82ed5f3393 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 14:21:57 +0300 Subject: [PATCH 0127/1079] discord: use distro layout for stable on Linux --- .../instant-messengers/discord/linux.nix | 93 ++++++------------- .../instant-messengers/discord/sources.json | 72 +++++++++++++- 2 files changed, 96 insertions(+), 69 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index cf5ec0193b11..0e725bd3e103 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -87,31 +87,13 @@ let ]; enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods); - # Starting with discord-development 0.0.235, the linux tarball ships only a - # small `updater_bootstrap` ELF that downloads the real app at first launch - # - # That binary always fetches the latest version from Discord's CDN with no way - # to pin, making the build impure and the nix version a lie - # - # Instead we fetch the app directly from the distributions API at build time: - # https://updates.discord.com/distributions/app/manifests/latest?channel=... - # The host + module distros are brotli-compressed tars on Discord's CDN at - # predictable URLs with SHA256 hashes in the manifest - isDistro = source.kind == "distro"; - inherit (source) version; - src = - if isDistro then - fetchurl { inherit (source.distro) url hash; } - else - fetchurl { inherit (source) url hash; }; + src = fetchurl { inherit (source.distro) url hash; }; - moduleSrcs = lib.optionalAttrs isDistro ( - lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules - ); + moduleSrcs = lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules; - moduleVersions = lib.optionalAttrs isDistro (lib.mapAttrs (_: mod: mod.version) source.modules); + moduleVersions = lib.mapAttrs (_: mod: mod.version) source.modules; libPath = lib.makeLibraryPath ( [ @@ -218,8 +200,8 @@ stdenv.mkDerivation (finalAttrs: { libxshmfence wrapGAppsHook3 makeShellWrapper - ] - ++ lib.optionals isDistro [ brotli ]; + brotli + ]; dontWrapGApps = true; @@ -228,20 +210,20 @@ stdenv.mkDerivation (finalAttrs: { libgbm nspr nss - ] - # The new distro layout ships prebuilt `.node` modules: - # discord_dispatch is linked against openssl 1.1, discord_voice against libpulseaudio. - # Ignore the missing dependency on insecure openssl_1_1: discord_dispatch is - # effectively unused in practice. - ++ lib.optionals isDistro [ libpulseaudio ]; + # The distro layout ships prebuilt `.node` modules: + # discord_dispatch is linked against openssl 1.1, discord_voice against libpulseaudio. + # Ignore the missing dependency on insecure openssl_1_1: discord_dispatch is + # effectively unused in practice. + libpulseaudio + ]; strictDeps = true; - dontUnpack = isDistro; + dontUnpack = true; inherit libPath; - autoPatchelfIgnoreMissingDeps = lib.optionals isDistro [ + autoPatchelfIgnoreMissingDeps = [ "libssl.so.1.1" "libcrypto.so.1.1" ]; @@ -250,41 +232,22 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/256x256/apps} - '' - + ( - if isDistro then - '' - # Distro layout (currently discord-ptb, discord-canary and discord-development): - # - # The host distro is a brotli-compressed tar with all files under a `files/` - # prefix (the channel binary, libffmpeg.so, resources/, etc). Module distros - # follow the same format with module contents under `files/` - # - # The module directory layout must match what Discord's node runtime - # expects: modules// (the moduleUpdater extracts zips into - # path.join(moduleInstallPath, moduleName) see processUnzipQueue) - brotli -d < $src | tar xf - --strip-components=1 -C $out/opt/${binaryName} - chmod +x $out/opt/${binaryName}/${binaryName} + # The host distro is a brotli-compressed tar with all files under a `files/` + # prefix (the channel binary, libffmpeg.so, resources/, etc). Module distros + # follow the same format with module contents under `files/` + brotli -d < $src | tar xf - --strip-components=1 -C $out/opt/${binaryName} + chmod +x $out/opt/${binaryName}/${binaryName} - # Extract native modules - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (name: src: '' - mkdir -p $out/opt/${binaryName}/modules/${name} - brotli -d < ${src} | tar xf - --strip-components=1 -C $out/opt/${binaryName}/modules/${name} - '') moduleSrcs - )} - - '' - else - '' - # Tarball layout (stable): the tarball unpacks into a - # directory containing the channel binary directly - mv * $out/opt/${binaryName} - chmod +x $out/opt/${binaryName}/${binaryName} - '' - ) - + '' + # The module directory layout must match what Discord's node runtime + # expects: modules// (the moduleUpdater extracts zips into + # path.join(moduleInstallPath, moduleName) see processUnzipQueue) + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: src: '' + mkdir -p $out/opt/${binaryName}/modules/${name} + brotli -d < ${src} | tar xf - --strip-components=1 -C $out/opt/${binaryName}/modules/${name} + '') moduleSrcs + )} wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ @@ -297,7 +260,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName} \ ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \ - ${lib.strings.optionalString isDistro ''--run "${stageModules} $out/opt/${binaryName}/modules"''} \ + --run "${stageModules} $out/opt/${binaryName}/modules" \ --add-flags ${lib.escapeShellArg commandLineArgs} ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 75b84c0d4e7d..c6bdbeed05b4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -210,10 +210,74 @@ "version": "1.0.189" }, "linux-stable": { - "hash": "sha256-vMuoz1OR0cKvrfT/ilkNXEtEP3zEwyNGh6AW5iQADws=", - "kind": "legacy", - "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.135/discord-0.0.135.tar.gz", - "version": "0.0.135" + "distro": { + "hash": "sha256-RlQEGuQlnvISzvNAXtJAEaHSvC/8AhNcfEc8paV9JKA=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/full.distro" + }, + "kind": "distro", + "modules": { + "discord_cloudsync": { + "hash": "sha256-9x/7+65hT5mcOOlUcSkWa7As+6Bxdv9vps/ZYgj+8TI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_cloudsync/1/full.distro", + "version": 1 + }, + "discord_desktop_core": { + "hash": "sha256-9ocCcvhubWXUCwPewJdKolt0CRbunzVIjWUsser1NA4=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_desktop_core/1/full.distro", + "version": 1 + }, + "discord_dispatch": { + "hash": "sha256-3Hqi3/5zfmDheMIbWN9l8qb/bNo9/pzfxQqYureCfMI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_dispatch/1/full.distro", + "version": 1 + }, + "discord_erlpack": { + "hash": "sha256-lSR9PV2nG5+vgNqpjUrC8ygKv8bfvUk+i+F7nCEjV1Q=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_erlpack/1/full.distro", + "version": 1 + }, + "discord_game_utils": { + "hash": "sha256-jf3Gf95QmZVjzAB0Ui2eSErP58hNd+YRyyYKe9xtQlQ=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_game_utils/1/full.distro", + "version": 1 + }, + "discord_krisp": { + "hash": "sha256-jrEaudW1wI4dKIvZd+1/CfybdWainF9TApptzffxQiI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_krisp/1/full.distro", + "version": 1 + }, + "discord_modules": { + "hash": "sha256-jN+R1e8aDVXyq6J+1+h8Hienli7pj+xhZU8PUKCtXn8=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_modules/1/full.distro", + "version": 1 + }, + "discord_rpc": { + "hash": "sha256-f/rSx/dFSmORLVPNvG5iqJb1KN5CBchXEUzwJwP21zU=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_rpc/1/full.distro", + "version": 1 + }, + "discord_spellcheck": { + "hash": "sha256-t1Y8DGpVQ1pzCz6tScaTnY9KvxSnUnIk26twTVupdX4=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_spellcheck/1/full.distro", + "version": 1 + }, + "discord_utils": { + "hash": "sha256-FH0Fb4M+L+WETHQBJuFqbS/h0nLlWTTTnV7lp1lqcCU=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_utils/1/full.distro", + "version": 1 + }, + "discord_voice": { + "hash": "sha256-X5u3XuXdco84LG0lZS0uAgks0XjesxOltYGn0XP3akQ=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_voice/1/full.distro", + "version": 1 + }, + "discord_zstd": { + "hash": "sha256-tZgzaVh2/CrvtYPOVJE3vrZuWbs9JxQSi74KeNf0mJw=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_zstd/1/full.distro", + "version": 1 + } + }, + "version": "1.0.137" }, "osx-canary": { "distro": { From a6f37ca30c27fc06d4266a79dd95c0515bde54e7 Mon Sep 17 00:00:00 2001 From: Harinn Date: Thu, 7 May 2026 11:43:43 +0700 Subject: [PATCH 0128/1079] asha-pipewire-sink: 0-unstable-2024-10-22 -> 0-unstable-2025-05-20 --- pkgs/by-name/as/asha-pipewire-sink/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asha-pipewire-sink/package.nix b/pkgs/by-name/as/asha-pipewire-sink/package.nix index e80af67f50e3..0dccf53a9896 100644 --- a/pkgs/by-name/as/asha-pipewire-sink/package.nix +++ b/pkgs/by-name/as/asha-pipewire-sink/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { pname = "asha-pipewire-sink"; - version = "0-unstable-2024-10-22"; + version = "0-unstable-2025-05-20"; src = fetchFromGitHub { owner = "thewierdnut"; repo = "asha_pipewire_sink"; - rev = "bbf665b9a3b90fcdbaeb092799ea3c5ba4347e31"; - hash = "sha256-PuJ6lBV7s5OqGe1X4wD7T+8LVMCFpgvM1pnMjXYr8gs="; + rev = "16a9c1cfba2d9aaa2cedbd86b4aa4f8e556736ae"; + hash = "sha256-9nfcFB37rBvgu0usySxovbxwQLrGCKDg6dk5kBU50C4="; }; nativeBuildInputs = [ From c46626f825f8fe7286b9a4a50b97b932a12f0619 Mon Sep 17 00:00:00 2001 From: TANIGUCHI Kohei Date: Thu, 7 May 2026 14:29:08 +0900 Subject: [PATCH 0129/1079] tinty: 0.29.0 -> 0.32.2 --- pkgs/by-name/ti/tinty/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ti/tinty/package.nix b/pkgs/by-name/ti/tinty/package.nix index f432dddf25a9..597100daeb2a 100644 --- a/pkgs/by-name/ti/tinty/package.nix +++ b/pkgs/by-name/ti/tinty/package.nix @@ -6,7 +6,7 @@ nix-update-script, }: let - version = "0.29.0"; + version = "0.32.2"; in rustPlatform.buildRustPackage { pname = "tinty"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "tinted-theming"; repo = "tinty"; tag = "v${version}"; - hash = "sha256-p05fRJR0boNKGAZ7+KGPyY3XUmj20QfZteWr80cA/po="; + hash = "sha256-+13iS99bwvIZDy96x1fgOtDyvbu59ieY4nUZk91mK4s="; }; - cargoHash = "sha256-Mdfz412Y1kb4V6LXOHxrbP3WsnWiZ+irCO5Qi3DRQ4c="; + cargoHash = "sha256-gShC4+uzdJVi3KuLc6ImJRvEWvIY4vgKcYT8Aykm0Xc="; # Pretty much all tests require internet access doCheck = false; @@ -35,7 +35,10 @@ rustPlatform.buildRustPackage { changelog = "https://github.com/tinted-theming/tinty/blob/refs/tags/v${version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ pluiedev ]; + maintainers = with lib.maintainers; [ + pluiedev + cohei + ]; mainProgram = "tinty"; }; } From af6d58f9b5fb54e890e6c1535d25ae1a553909cf Mon Sep 17 00:00:00 2001 From: Jack Rosenberg Date: Thu, 7 May 2026 11:13:01 +0200 Subject: [PATCH 0130/1079] ugarit-manifest-maker: drop --- .../by-name/ug/ugarit-manifest-maker/eggs.nix | 430 ------------------ .../ug/ugarit-manifest-maker/package.nix | 37 -- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 467 deletions(-) delete mode 100644 pkgs/by-name/ug/ugarit-manifest-maker/eggs.nix delete mode 100644 pkgs/by-name/ug/ugarit-manifest-maker/package.nix diff --git a/pkgs/by-name/ug/ugarit-manifest-maker/eggs.nix b/pkgs/by-name/ug/ugarit-manifest-maker/eggs.nix deleted file mode 100644 index eaf2b9617cce..000000000000 --- a/pkgs/by-name/ug/ugarit-manifest-maker/eggs.nix +++ /dev/null @@ -1,430 +0,0 @@ -{ eggDerivation, fetchegg }: -rec { - blob-utils = eggDerivation { - name = "blob-utils-1.0.3"; - - src = fetchegg { - name = "blob-utils"; - version = "1.0.3"; - sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml"; - }; - - buildInputs = [ - setup-helper - string-utils - ]; - }; - - check-errors = eggDerivation { - name = "check-errors-1.13.0"; - - src = fetchegg { - name = "check-errors"; - version = "1.13.0"; - sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi"; - }; - - buildInputs = [ - setup-helper - ]; - }; - - crypto-tools = eggDerivation { - name = "crypto-tools-1.3"; - - src = fetchegg { - name = "crypto-tools"; - version = "1.3"; - sha256 = "0442wly63zis19vh8xc9nhxgp9sabaccxylpzmchd5f1d48iag65"; - }; - - buildInputs = [ - - ]; - }; - - fnmatch = eggDerivation { - name = "fnmatch-1.0.1"; - - src = fetchegg { - name = "fnmatch"; - version = "1.0.1"; - sha256 = "1m3jmyhkyqmjr7v628g6w5n3cqihcfnryrxn91k4597q7vjhikqr"; - }; - - buildInputs = [ - - ]; - }; - - foreigners = eggDerivation { - name = "foreigners-1.4.1"; - - src = fetchegg { - name = "foreigners"; - version = "1.4.1"; - sha256 = "07nvyadhkd52q0kkvch1a5d7ivpmrhmyg295s4mxb1nw4wz46gfz"; - }; - - buildInputs = [ - matchable - ]; - }; - - lookup-table = eggDerivation { - name = "lookup-table-1.13.5"; - - src = fetchegg { - name = "lookup-table"; - version = "1.13.5"; - sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb"; - }; - - buildInputs = [ - setup-helper - check-errors - miscmacros - record-variants - synch - ]; - }; - - lru-cache = eggDerivation { - name = "lru-cache-0.5.3"; - - src = fetchegg { - name = "lru-cache"; - version = "0.5.3"; - sha256 = "0z6g3106c4j21v968hfzy9nnbfq2d83y0nyd20aifpq4g55c0d40"; - }; - - buildInputs = [ - record-variants - ]; - }; - - matchable = eggDerivation { - name = "matchable-3.3"; - - src = fetchegg { - name = "matchable"; - version = "3.3"; - sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990"; - }; - - buildInputs = [ - - ]; - }; - - message-digest = eggDerivation { - name = "message-digest-3.1.0"; - - src = fetchegg { - name = "message-digest"; - version = "3.1.0"; - sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s"; - }; - - buildInputs = [ - setup-helper - miscmacros - check-errors - variable-item - blob-utils - string-utils - ]; - }; - - miscmacros = eggDerivation { - name = "miscmacros-2.96"; - - src = fetchegg { - name = "miscmacros"; - version = "2.96"; - sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc"; - }; - - buildInputs = [ - - ]; - }; - - numbers = eggDerivation { - name = "numbers-4.4"; - - src = fetchegg { - name = "numbers"; - version = "4.4"; - sha256 = "0bg5zs6jcr9arj4a7r2xqxf2n17bx93640jaivgchbdj1gixranm"; - }; - - buildInputs = [ - - ]; - }; - - parley = eggDerivation { - name = "parley-0.9.2"; - - src = fetchegg { - name = "parley"; - version = "0.9.2"; - sha256 = "1vsbx4dk1240gzq02slzmavd1jrq04qj7ssnvg15h8xh81xwhbbz"; - }; - - buildInputs = [ - stty - srfi-71 - miscmacros - ]; - }; - - pathname-expand = eggDerivation { - name = "pathname-expand-0.1"; - - src = fetchegg { - name = "pathname-expand"; - version = "0.1"; - sha256 = "14llya7l04z49xpi3iylk8aglrw968vy304ymavhhqlyzmzwkx3g"; - }; - - buildInputs = [ - - ]; - }; - - posix-extras = eggDerivation { - name = "posix-extras-0.1.6"; - - src = fetchegg { - name = "posix-extras"; - version = "0.1.6"; - sha256 = "0gnmhn2l0161ham7f8i0lx1ay94ap8l8l7ga4nw9qs86lk024abi"; - }; - - buildInputs = [ - - ]; - }; - - record-variants = eggDerivation { - name = "record-variants-0.5.1"; - - src = fetchegg { - name = "record-variants"; - version = "0.5.1"; - sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h"; - }; - - buildInputs = [ - - ]; - }; - - regex = eggDerivation { - name = "regex-1.0"; - - src = fetchegg { - name = "regex"; - version = "1.0"; - sha256 = "1z9bh7xvab6h5cdlsz8jk02pv5py1i6ryqarbcs3wdgkkjgmmkif"; - }; - - buildInputs = [ - - ]; - }; - - setup-helper = eggDerivation { - name = "setup-helper-1.5.5"; - - src = fetchegg { - name = "setup-helper"; - version = "1.5.5"; - sha256 = "1lpplp8f2wyc486dd98gs4wl1kkhh1cs6vdqkxrdk7f92ikmwbx3"; - }; - - buildInputs = [ - - ]; - }; - - sql-de-lite = eggDerivation { - name = "sql-de-lite-0.6.6"; - - src = fetchegg { - name = "sql-de-lite"; - version = "0.6.6"; - sha256 = "1mh3hpsibq2gxcpjaycqa4ckznj268xpfzsa6pn0i6iac6my3qra"; - }; - - buildInputs = [ - lru-cache - foreigners - ]; - }; - - srfi-37 = eggDerivation { - name = "srfi-37-1.3.1"; - - src = fetchegg { - name = "srfi-37"; - version = "1.3.1"; - sha256 = "1a2zdkdzrv15fw9dfdy8067fsgh4kr8ppffm8mc3cmlczrrd58cb"; - }; - - buildInputs = [ - - ]; - }; - - srfi-71 = eggDerivation { - name = "srfi-71-1.1"; - - src = fetchegg { - name = "srfi-71"; - version = "1.1"; - sha256 = "01mlaxw2lfczykmx69xki2s0f4ywlg794rl4kz07plvzn0s3fbqq"; - }; - - buildInputs = [ - - ]; - }; - - ssql = eggDerivation { - name = "ssql-0.2.4"; - - src = fetchegg { - name = "ssql"; - version = "0.2.4"; - sha256 = "0qhnghhx1wrvav4s7l780mspwlh8s6kzq4bl0cslwp1km90fx9bk"; - }; - - buildInputs = [ - matchable - ]; - }; - - string-utils = eggDerivation { - name = "string-utils-1.2.4"; - - src = fetchegg { - name = "string-utils"; - version = "1.2.4"; - sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1"; - }; - - buildInputs = [ - setup-helper - miscmacros - lookup-table - check-errors - ]; - }; - - stty = eggDerivation { - name = "stty-0.2.6"; - - src = fetchegg { - name = "stty"; - version = "0.2.6"; - sha256 = "09jmjpdsd3yg6d0f0imcihmn49i28x09lgl60i2dllffs25k22s4"; - }; - - buildInputs = [ - setup-helper - foreigners - ]; - }; - - synch = eggDerivation { - name = "synch-2.1.2"; - - src = fetchegg { - name = "synch"; - version = "2.1.2"; - sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00"; - }; - - buildInputs = [ - setup-helper - check-errors - ]; - }; - - tiger-hash = eggDerivation { - name = "tiger-hash-3.1.0"; - - src = fetchegg { - name = "tiger-hash"; - version = "3.1.0"; - sha256 = "0j9dsbjp9cw0y4w4srg0qwgh53jw2v3mx4y4h040ds0fkxlzzknx"; - }; - - buildInputs = [ - message-digest - ]; - }; - - ugarit = eggDerivation { - name = "ugarit-2.0"; - - src = fetchegg { - name = "ugarit"; - version = "2.0"; - sha256 = "1l5zkr6b8l5dw9p5mimbva0ncqw1sbvp3d4cywm1hqx2m03a0f1n"; - }; - - buildInputs = [ - miscmacros - sql-de-lite - crypto-tools - srfi-37 - stty - matchable - regex - tiger-hash - message-digest - posix-extras - parley - ssql - pathname-expand - ]; - }; - - ugarit-manifest-maker = eggDerivation { - name = "ugarit-manifest-maker-0.1"; - - src = fetchegg { - name = "ugarit-manifest-maker"; - version = "0.1"; - sha256 = "1jv8lhn4s5a3qphqd3zfwl1py0m5cmqj1h55ys0935m5f422547q"; - }; - - buildInputs = [ - matchable - srfi-37 - fnmatch - miscmacros - ugarit - numbers - ]; - }; - - variable-item = eggDerivation { - name = "variable-item-1.3.1"; - - src = fetchegg { - name = "variable-item"; - version = "1.3.1"; - sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n"; - }; - - buildInputs = [ - setup-helper - check-errors - ]; - }; -} diff --git a/pkgs/by-name/ug/ugarit-manifest-maker/package.nix b/pkgs/by-name/ug/ugarit-manifest-maker/package.nix deleted file mode 100644 index 2811980c095f..000000000000 --- a/pkgs/by-name/ug/ugarit-manifest-maker/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - chickenPackages_4, -}: - -let - eggs = import ./eggs.nix { inherit (chickenPackages_4) eggDerivation fetchegg; }; -in - -chickenPackages_4.eggDerivation rec { - pname = "ugarit-manifest-maker"; - version = "0.1"; - name = "${pname}-${version}"; - - src = chickenPackages_4.fetchegg { - inherit version; - name = pname; - sha256 = "1jv8lhn4s5a3qphqd3zfwl1py0m5cmqj1h55ys0935m5f422547q"; - }; - - buildInputs = with eggs; [ - matchable - srfi-37 - fnmatch - miscmacros - ugarit - numbers - ]; - - meta = { - homepage = "https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/"; - description = "Tool for generating import manifests for Ugarit"; - mainProgram = "ugarit-manifest-maker"; - license = lib.licenses.bsd3; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index de766a5981cd..5eb29125a349 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2087,6 +2087,7 @@ mapAliases { ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27 udisks2 = udisks; # Added 2025-10-30 ue4demos = throw "'ue4demos' has been removed because it is unmaintained"; # Added 2026-02-07 + ugarit-manifest-maker = throw "'ugarit-manifest-maker' has been removed because it is unmaintained"; # Added 2026-05-07 unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17 unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27 unixODBC = warnAlias "'unixODBC' has been renamed to 'unixodbc'" unixodbc; # Added 2026-02-12 From 1ce65572695ec7c712778fe5e74d55c439fc70f5 Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 7 May 2026 17:03:36 +0200 Subject: [PATCH 0131/1079] factoriolab: fix changelog url --- pkgs/by-name/fa/factoriolab/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index f170132fc08a..a4d8b5f9c531 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -49,7 +49,7 @@ buildNpmPackage rec { meta = { homepage = "https://github.com/factoriolab/factoriolab"; - changelog = "https://github.com/factoriolab/factoriolab/releases/tag/${version}"; + changelog = "https://github.com/factoriolab/factoriolab/releases/tag/v${version}"; description = "Angular-based calculator for factory games like Factorio and Dyson Sphere Program"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ patrickdag ]; From c9f72372b593cbf19d7bbb5059fb5405e76fefdf Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 7 May 2026 17:03:36 +0200 Subject: [PATCH 0132/1079] factoriolab: 3.19.2 -> 3.20.0 --- pkgs/by-name/fa/factoriolab/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/factoriolab/package.nix b/pkgs/by-name/fa/factoriolab/package.nix index a4d8b5f9c531..a9322f593bd4 100644 --- a/pkgs/by-name/fa/factoriolab/package.nix +++ b/pkgs/by-name/fa/factoriolab/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage rec { pname = "factoriolab"; - version = "3.19.2"; + version = "3.20.0"; src = fetchFromGitHub { owner = "factoriolab"; repo = "factoriolab"; tag = "v${version}"; - hash = "sha256-DjNsn3PVGf+36m+k2j9NMQTqhPj8HF6V8wqaQKUB4Ho="; + hash = "sha256-GQNDYURKJFeuXM2k99xk/5cRCoQglAUlDBS7V/NkC7s="; fetchLFS = true; }; buildInputs = [ vips ]; From baa1fd0958af059dc4fa350ed6136aedfc942cdf Mon Sep 17 00:00:00 2001 From: coolcuber Date: Wed, 6 May 2026 18:29:35 -0400 Subject: [PATCH 0133/1079] maintainers: add coolcuber --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8e9718c9baea..d50755e13e24 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5496,6 +5496,12 @@ githubId = 32609395; name = "B YI"; }; + coolcuber = { + email = "rpgeorg@clemson.edu"; + github = "coolcuber"; + githubId = 35880825; + name = "Ross George"; + }; coolGi = { email = "me@coolgi.dev"; github = "coolGi69"; From 7e60541a0dd38c854072368b1f918c6d9e302560 Mon Sep 17 00:00:00 2001 From: Noodlez1232 Date: Thu, 7 May 2026 11:24:01 -0700 Subject: [PATCH 0134/1079] fedistar: 1.11.3 -> 1.13.0 --- pkgs/by-name/fe/fedistar/package.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix index cc2a133525c9..23c2bdd8d00d 100644 --- a/pkgs/by-name/fe/fedistar/package.nix +++ b/pkgs/by-name/fe/fedistar/package.nix @@ -20,25 +20,25 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fedistar"; - version = "1.11.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "h3poteto"; repo = "fedistar"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q2j6K4ys/z77+n3kdGJ15rWbFlbbIHBWB9hOARsgg2A="; + hash = "sha256-Q2IfWeMV6yvmCmKBc/iufO28DyIIlj50wp9A7LbQcIY="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = "src-tauri"; - cargoHash = "sha256-ZJgyrFDtzAH3XqDdnJ27Yn+WsTMrZR2+lnkZ6bw6hzg="; + cargoHash = "sha256-eYPvG07V0DKPQfs6g+oayDcF3Xn74Aq52ZA+psyoSnY="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-IznO8PJZCr6MR3mShD+Uqk2ACx8mrxTVWRTbk81zFEc="; + hash = "sha256-GnVBCrBCnS0Tl9jZu3poIZZJO2SRdlS8jOYUE9G+BFM="; }; nativeBuildInputs = [ @@ -62,12 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: { doCheck = false; # This version's tests do not pass - passthru.updateScript = nix-update-script { - extraArgs = [ - "--subpackage" - "fedistar-frontend" - ]; - }; + passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; meta = { description = "Multi-column Fediverse client application for desktop"; From 5e918e015ebb6026056966d425bcc1c22fb9ab94 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Thu, 7 May 2026 12:19:17 -0700 Subject: [PATCH 0135/1079] inklingreader: unstable-2017-09-07 -> 0.8-unstable-2026-05-06 --- pkgs/by-name/in/inklingreader/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inklingreader/package.nix b/pkgs/by-name/in/inklingreader/package.nix index c89c3c7b4e4c..76c76bb131a5 100644 --- a/pkgs/by-name/in/inklingreader/package.nix +++ b/pkgs/by-name/in/inklingreader/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, autoreconfHook, pkg-config, + wrapGAppsHook3, gtk3, librsvg, libusb1, @@ -11,18 +12,19 @@ stdenv.mkDerivation { pname = "inklingreader"; - version = "unstable-2017-09-07"; + version = "0.8-unstable-2026-05-06"; src = fetchFromGitHub { owner = "roelj"; repo = "inklingreader"; - rev = "90f9d0d7f5353657f4d25fd75635e29c10c08d2e"; - sha256 = "sha256-852m8g61r+NQhCYz9ghSbCG0sjao2E8B9GS06NG4GyY="; + rev = "44026d82e494b8068ebd8be377516053487cc2c6"; + hash = "sha256-NfjLzgFxo3h3gpPeQ+un5f8n1kIxUBQLLRV2CptuxzA="; }; nativeBuildInputs = [ autoreconfHook pkg-config + wrapGAppsHook3 ]; buildInputs = [ gtk3 From 7ef4e3393f0cc887cb15d1d1a62a921ee5f2f870 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Thu, 7 May 2026 22:09:05 +0200 Subject: [PATCH 0136/1079] tautulli: 2.17.0 -> 2.17.1 --- pkgs/by-name/ta/tautulli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tautulli/package.nix b/pkgs/by-name/ta/tautulli/package.nix index c50c8750ccbd..5aaf3a2a0208 100644 --- a/pkgs/by-name/ta/tautulli/package.nix +++ b/pkgs/by-name/ta/tautulli/package.nix @@ -6,8 +6,8 @@ }: python3Packages.buildPythonApplication (finalAttrs: { - pname = "Tautulli"; - version = "2.17.0"; + pname = "tautulli"; + version = "2.17.1"; pyproject = false; pythonPath = [ python3Packages.setuptools ]; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "Tautulli"; repo = "Tautulli"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-1NslfaQLQvYM0WeAxzAmZVHTgVbFB2XK/8T+EoCMK1k="; + sha256 = "sha256-aD8kolDD1CpGiPmTzEA8Ft0PEdkhzDuR1z5LFHeXIZs="; }; installPhase = '' From b851d316f152db02bb730f6c621365c169e25957 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 May 2026 21:59:55 +0000 Subject: [PATCH 0137/1079] socalabs-voc: 1.1.1 -> 1.1.5 --- pkgs/by-name/so/socalabs-voc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/socalabs-voc/package.nix b/pkgs/by-name/so/socalabs-voc/package.nix index d1f7e6501f43..51c2e57714bb 100644 --- a/pkgs/by-name/so/socalabs-voc/package.nix +++ b/pkgs/by-name/so/socalabs-voc/package.nix @@ -30,13 +30,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "socalabs-voc"; - version = "1.1.1"; + version = "1.1.5"; src = fetchFromGitHub { owner = "FigBug"; repo = "Voc"; tag = "v${finalAttrs.version}"; - hash = "sha256-wLO/855JkpCN7BL5/V7bZJa4d9MvnfYrTC3d+0p1+F4="; + hash = "sha256-t9z+qnboGfHUcOp9WmfWXG7ss8VTkz8cv5qUMy//3AE="; fetchSubmodules = true; preFetch = '' # can't clone using ssh From 8d1876b47a04f526b677e04a50914a32817e29c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 May 2026 22:00:24 +0000 Subject: [PATCH 0138/1079] socalabs-sn76489: 1.1.1 -> 1.1.5 --- pkgs/by-name/so/socalabs-sn76489/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/socalabs-sn76489/package.nix b/pkgs/by-name/so/socalabs-sn76489/package.nix index 85fed2b6f135..972c0a30a45c 100644 --- a/pkgs/by-name/so/socalabs-sn76489/package.nix +++ b/pkgs/by-name/so/socalabs-sn76489/package.nix @@ -29,7 +29,7 @@ enableVST2 ? false, }: let - version = "1.1.1"; + version = "1.1.5"; in stdenv.mkDerivation { pname = "socalabs-sn76489"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { owner = "FigBug"; repo = "SN76489"; tag = "v${version}"; - hash = "sha256-Dzv9qtUtuiQa2pc1TN9qyQWHP2pBU7bGXHZgALjKr3U="; + hash = "sha256-dQ697B0mhdIC0ltdY2EnErLNAGRKA6ARONX/kR3OLyI="; fetchSubmodules = true; preFetch = '' # can't clone using ssh From 9f4adaafb176d2e80258f2cde32a6bea6dfcbbe4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 May 2026 00:45:34 +0000 Subject: [PATCH 0139/1079] betula: 1.6.0 -> 1.7.0 --- pkgs/by-name/be/betula/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/be/betula/package.nix b/pkgs/by-name/be/betula/package.nix index 3480ee1f6ec7..0e1e681cee8a 100644 --- a/pkgs/by-name/be/betula/package.nix +++ b/pkgs/by-name/be/betula/package.nix @@ -5,15 +5,15 @@ }: buildGoModule (finalAttrs: { pname = "betula"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromSourcehut { owner = "~bouncepaw"; repo = "betula"; rev = "v${finalAttrs.version}"; - hash = "sha256-14ws/iVVnvS6SRwco1iSBOZzYP6pIGhBwX5CDiwm93o="; + hash = "sha256-8iDWWAL8JDZyKl3o0IJsWml410jh3cTPC2AoonvqiTI="; }; - vendorHash = "sha256-PFvMZZUvHDE8onTxrqI53+gEFvZ42zJn4Q7gtDrmRdo="; + vendorHash = "sha256-HGjaS2Sqsjk/pilt8wtx5Ect8Y8S5638PWEpXCqeZ6w="; env.CGO_ENABLED = 1; # These tests use internet, so are failing in Nix build. From e888dc4c3bd7ecad4eecb7cd15da2296fa441213 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 May 2026 02:21:58 +0200 Subject: [PATCH 0140/1079] python3Packages.granian: 2.7.2 -> 2.7.4 Changelog: https://github.com/emmett-framework/granian/releases/tag/v2.7.4 Had to re-create the mimalloc patch, opted to reduce the context to avoid doing so again in the future --- .../python-modules/granian/default.nix | 10 ++++--- .../python-modules/granian/no-alloc.patch | 30 +++++-------------- 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index cb3493129df8..90dc1af4e827 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -11,6 +11,7 @@ versionCheckHook, pytestCheckHook, pytest-asyncio, + python-dotenv, websockets, httpx, sniffio, @@ -19,14 +20,14 @@ buildPythonPackage rec { pname = "granian"; - version = "2.7.2"; + version = "2.7.4"; pyproject = true; src = fetchFromGitHub { owner = "emmett-framework"; repo = "granian"; tag = "v${version}"; - hash = "sha256-6CtmoY3BHO2t+ZjMzZPKUufOkaal0K+MTYhC1eiVXWQ="; + hash = "sha256-KId5e1ITRCkLNmvY5q/ZT18INzS8Uh9HFCzfKEablOY="; }; # Granian forces a custom allocator for all the things it runs, @@ -34,12 +35,12 @@ buildPythonPackage rec { # and allow the final application to make the allocator decision # via LD_PRELOAD or similar. patches = [ - ./no-alloc.patch + ./no-alloc.patch # with --unified=1 context ]; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-7KeidUDMH79b8qgAR5bvY8tAmW5OHmVtLIdb9LlP9w0="; + hash = "sha256-rR65e05uWmag+21n1YA1TILYU6ArajW2+QVOfGn4zGo="; }; nativeBuildInputs = with rustPlatform; [ @@ -52,6 +53,7 @@ buildPythonPackage rec { ]; optional-dependencies = { + dotenv = [ python-dotenv ]; pname = [ setproctitle ]; reload = [ watchfiles ]; # rloop = [ rloop ]; # not packaged diff --git a/pkgs/development/python-modules/granian/no-alloc.patch b/pkgs/development/python-modules/granian/no-alloc.patch index 28fff30c74f0..d6b01f9475b1 100644 --- a/pkgs/development/python-modules/granian/no-alloc.patch +++ b/pkgs/development/python-modules/granian/no-alloc.patch @@ -1,39 +1,27 @@ diff --git a/Cargo.toml b/Cargo.toml -index c7d1647..d5710bd 100644 +index e1b6a3d..8fe77cf 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -41,7 +41,6 @@ hyper = { version = "=1.8", features = ["http1", "http2", "server"] } - hyper-util = { version = "=0.1", features = ["server-auto", "tokio"] } - itertools = "0.14" +@@ -46,3 +46,2 @@ itertools = "0.14" log = "0.4" --mimalloc = { version = "0.1.43", default-features = false, features = ["local_dynamic_tls", "v3"], optional = true } +-mimalloc = { version = "0.1.49", default-features = false, features = ["local_dynamic_tls"], optional = true } mime_guess = "=2.0" - pem = "=3.0" - percent-encoding = "=2.3" -@@ -52,7 +51,6 @@ pyo3-log = { version = "=0.13", git = "https://github.com/gi0baro/pyo3-log.git", - rustls-pemfile = "2.2" - socket2 = { version = "=0.6", features = ["all"] } - sysinfo = "=0.37" +@@ -58,3 +57,2 @@ socket2 = { version = "=0.6", features = ["all"] } + sysinfo = "=0.38" -tikv-jemallocator = { version = "0.6.0", default-features = false, features = ["disable_initial_exec_tls"], optional = true } tls-listener = { version = "=0.11", git = "https://github.com/gi0baro/tls-listener.git", branch = "0.11.x", features = ["rustls-ring", "rustls-tls12"] } - tokio = { version = "1.45", features = ["full"] } - tokio-stream = "0.1" -@@ -62,10 +60,6 @@ tokio-util = { version = "0.7", features = ["codec", "rt"] } - [build-dependencies] - pyo3-build-config = "=0.27" +@@ -68,6 +66,2 @@ pyo3-build-config = "=0.27" -[features] -jemalloc = ["dep:tikv-jemallocator"] -mimalloc = ["dep:mimalloc"] - [profile.release] - codegen-units = 1 - debug = false diff --git a/src/lib.rs b/src/lib.rs -index a17a7e5..8ea1a4d 100644 +index f3a8218..805b725 100644 --- a/src/lib.rs +++ b/src/lib.rs -@@ -1,11 +1,3 @@ +@@ -1,9 +1 @@ -#[cfg(all(feature = "jemalloc", not(feature = "mimalloc")))] -#[global_allocator] -static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc; @@ -43,5 +31,3 @@ index a17a7e5..8ea1a4d 100644 -static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; - use pyo3::prelude::*; - use std::sync::OnceLock; - From bd1234e4757c879e80f2b6c5dbb736e898b84213 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Thu, 7 May 2026 18:41:12 -0700 Subject: [PATCH 0141/1079] typodermic-{free-fonts,public-domain}: drop --- .../ty/typodermic-free-fonts/package.nix | 38 ------------------- .../ty/typodermic-public-domain/package.nix | 36 ------------------ pkgs/top-level/aliases.nix | 2 + 3 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 pkgs/by-name/ty/typodermic-free-fonts/package.nix delete mode 100644 pkgs/by-name/ty/typodermic-public-domain/package.nix diff --git a/pkgs/by-name/ty/typodermic-free-fonts/package.nix b/pkgs/by-name/ty/typodermic-free-fonts/package.nix deleted file mode 100644 index 07b43ae4386e..000000000000 --- a/pkgs/by-name/ty/typodermic-free-fonts/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchzip, -}: - -stdenvNoCC.mkDerivation { - pname = "typodermic-free-fonts"; - version = "2024-12"; - - src = fetchzip { - url = "https://typodermicfonts.com/wp-content/uploads/2024/12/typodermic-free-fonts-2024d.zip"; - hash = "sha256-tfv0PTu1gOWXxaoiQJNqnhJKGChGlGJqsqsb/xvBfGU="; - curlOptsList = [ - "--user-agent" - "Mozilla/5.0" - ]; # unbreak their wordpress - stripRoot = false; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/fonts/opentype/ - cp "$src/"*.otf $out/share/fonts/opentype/ - runHook postInstall - ''; - - meta = { - homepage = "https://typodermicfonts.com/"; - description = "Typodermic fonts"; - license = lib.licenses.unfree // { - fullName = "Font Software for Desktop End User License Agreement"; - url = "https://typodermicfonts.com/end-user-license-agreement/"; - }; # Font is fine for use in printing and display but cannot be embbeded. - }; -} diff --git a/pkgs/by-name/ty/typodermic-public-domain/package.nix b/pkgs/by-name/ty/typodermic-public-domain/package.nix deleted file mode 100644 index 7cb52113b50e..000000000000 --- a/pkgs/by-name/ty/typodermic-public-domain/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchzip, -}: - -stdenvNoCC.mkDerivation { - pname = "typodermic-public-domain"; - version = "2024-04"; - - src = fetchzip { - url = "https://typodermicfonts.com/wp-content/uploads/2024/04/typodermic-public-domain-2024-04.zip"; - hash = "sha256-grAAU/yL/Q1EyZtrvcgrB6bcXMZoNs7suVYaKibqBOE="; - curlOptsList = [ - "--user-agent" - "Mozilla/5.0" - ]; # unbreak their wordpress - stripRoot = false; - }; - - dontUnpack = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/fonts - cp -a "$src/OpenType Fonts" "$out/share/fonts/opentype" - runHook postInstall - ''; - - meta = { - homepage = "https://typodermicfonts.com/"; - description = "Vintage Typodermic fonts"; - license = lib.licenses.cc0; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 92cd669ee0c1..4513e3637823 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2082,6 +2082,8 @@ mapAliases { trust-dns = throw "'trust-dns' has been renamed to/replaced by 'hickory-dns'"; # Converted to throw 2025-10-27 tvbrowser-bin = throw "'tvbrowser-bin' has been renamed to/replaced by 'tvbrowser'"; # Converted to throw 2025-10-27 twitterBootstrap = warnAlias "'twitterBootstrap' has been renamed to 'twitter-bootstrap'"; # Added 2026-02-12 + typodermic-free-fonts = throw "'typodermic-free-fonts' has been removed as it is unmaintained in nixpkgs, and the src is prone to breakage."; # Added 2026-05-07 + typodermic-public-domain = throw "'typodermic-public-domain' has been removed as it is unmaintained in nixpkgs, and the src is prone to breakage."; # Added 2026-05-07 typst-fmt = throw "'typst-fmt' has been renamed to/replaced by 'typstfmt'"; # Converted to throw 2025-10-27 typstfmt = throw "'typstfmt' has been removed due to lack of upstream maintenance, consider using 'typstyle' instead"; # Added 2025-10-26 uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27 From e968009ab411506d917ba8e81ac75228201d2a4f Mon Sep 17 00:00:00 2001 From: "xiaodong.jia" Date: Fri, 8 May 2026 12:17:41 +0800 Subject: [PATCH 0142/1079] nixos/prometheus-exporters: change repo to updated fork --- .../pr/prometheus-speedtest-exporter/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix b/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix index ab80dae916ee..844872009ef0 100644 --- a/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix @@ -4,25 +4,25 @@ fetchFromGitHub, }: -buildGoModule { +buildGoModule rec { __structuredAttrs = true; pname = "prometheus-speedtest-exporter"; - version = "0.0.5-unstable-2026-04-29"; + version = "v1.0.0"; src = fetchFromGitHub { owner = "podocarp"; repo = "speedtest_exporter"; - rev = "e82be2ecb5d0cbcd5a6a21909afed6991b5d7e00"; - hash = "sha256-7uy1rVll7YzM9WeQQKKSiI4nblIPADD6h/5z/diCH4E="; + rev = version; + hash = "sha256-n9eunZRssS13mTOeFeZ/PpfSj430DKf3ZRS10hY4Ps8="; }; - vendorHash = "sha256-w113vWnXM4h3zckmj39Qx/oZFaH9Mq0xUSqNxopdQO0="; + vendorHash = "sha256-HBg44D0CUc4HYCBwGrswnrqG5o5ltA6UT8L0oWetlIc="; meta = { description = "Speedtest.net Exporter for the Prometheus monitoring system"; mainProgram = "speedtest_exporter"; - homepage = "https://github.com/danopstech/speedtest_exporter"; + homepage = "https://github.com/podocarp/speedtest_exporter"; license = lib.licenses.gpl3Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ podocarp ]; }; } From b582171d3334903c126909d18d179ba40275ef98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 May 2026 05:28:44 +0000 Subject: [PATCH 0143/1079] seconlay: 0-unstable-2026-04-13 -> 0-unstable-2026-04-30 --- pkgs/by-name/se/seconlay/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/seconlay/package.nix b/pkgs/by-name/se/seconlay/package.nix index ba75dfa78942..96f91cf3e929 100644 --- a/pkgs/by-name/se/seconlay/package.nix +++ b/pkgs/by-name/se/seconlay/package.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "seconlay"; - version = "0-unstable-2026-04-13"; + version = "0-unstable-2026-04-30"; src = fetchFromGitLab { group = "alasca.cloud"; owner = "scl"; repo = "scl-management"; - rev = "af2a66ba496a39246ff180ec85b638a24dc74be9"; - hash = "sha256-T5j7tWcZsHG+LLJHxg+bhT+/8Nh1GznX3u3RLarT9J8="; + rev = "a2020efbbc950d037e17a3ae8d628e3205a80447"; + hash = "sha256-/m2HUdyT/euFVvWPZAHjPGsBH9XeUMuNGlfJFfH/A8Y="; }; cargoHash = "sha256-pb9xqdgWrf8Lc10jSkkDb/1n0e15fMQ3AcKNPw6/vi8="; From 62ebbdb129bb48e969655bce9e3d5bd03680e8d8 Mon Sep 17 00:00:00 2001 From: fxai Date: Fri, 8 May 2026 12:14:01 +0200 Subject: [PATCH 0144/1079] maintainers: add fxai --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 612d969dccb8..ac14a09261d1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9473,6 +9473,11 @@ name = "Faye Chun"; keys = [ { fingerprint = "ACB8 DB1F E88D A908 6332 BDB1 5A71 B010 2FD7 3FC0"; } ]; }; + fxai = { + github = "fxai"; + githubId = 44463990; + name = "fxai"; + }; fxfactorial = { email = "edgar.factorial@gmail.com"; github = "fxfactorial"; From fac86c55a0a7b473ca7cb1651e11dc92f4c64e15 Mon Sep 17 00:00:00 2001 From: wolfram444 Date: Fri, 8 May 2026 17:14:51 +0500 Subject: [PATCH 0145/1079] maintainers: update wolfram444 github's name --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 85a354481d6d..d20a43c0fcfe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -29666,7 +29666,7 @@ wolfram444 = { name = "Xabibulloh To'xtayev"; email = "kamiltox2006@gmail.com"; - github = "woolfram444"; + github = "wolfram444"; githubId = 109225370; }; womeier = { From bd89bb04d19f380dd6b8825c46a8992fa17a133d Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 8 May 2026 14:47:08 +0200 Subject: [PATCH 0146/1079] batmon: 0.0.1 -> 0.2.0 --- pkgs/by-name/ba/batmon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ba/batmon/package.nix b/pkgs/by-name/ba/batmon/package.nix index a9ce429333ac..992d31348105 100644 --- a/pkgs/by-name/ba/batmon/package.nix +++ b/pkgs/by-name/ba/batmon/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "batmon"; - version = "0.0.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "6543"; repo = "batmon"; tag = "v${finalAttrs.version}"; - hash = "sha256-+kjDNQKlaoI5fQ5FqYF6IPCKeE92WKxIhVCKafqfE0o="; + hash = "sha256-3k788ckEkHi4jlSzKCebFyLJJ+UtkMERuvHInkXvSyQ="; }; - cargoHash = "sha256-0SXb8jBAYKnNFguamSMosPE6gH9aUzydF16w3SLhOU4="; + cargoHash = "sha256-F0lC7ELvuRCnvTWrtTEedb9j8SF2Al6XXx0PJqa7E98="; meta = { description = "Interactive batteries viewer"; From e8ede596c884f504d94996f2e9dcf514372969e8 Mon Sep 17 00:00:00 2001 From: Edgar Pireyn Date: Fri, 8 May 2026 16:15:41 +0200 Subject: [PATCH 0147/1079] snyk: remove nodejs version pin See #515284. I did not update the package because of build errors. We should wait on upstream to update their dependencies. It may also be needed to pin nodejs again after upstream update. --- pkgs/by-name/sn/snyk/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/sn/snyk/package.nix b/pkgs/by-name/sn/snyk/package.nix index 0f7125798c45..191095e39362 100644 --- a/pkgs/by-name/sn/snyk/package.nix +++ b/pkgs/by-name/sn/snyk/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, testers, snyk, - nodejs_20, }: let @@ -33,8 +32,6 @@ buildNpmPackage { find -L $out -type l -print -delete ''; - nodejs = nodejs_20; - npmBuildScript = "build:prod"; passthru.tests.version = testers.testVersion { From 2d3e596c1e15bec0aa7d5ec511da01163a9a2aad Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Fri, 8 May 2026 10:44:31 -0400 Subject: [PATCH 0148/1079] nimlangserver: 1.12.0 -> 1.14.0 --- pkgs/by-name/ni/nimlangserver/lock.json | 8 ++++---- pkgs/by-name/ni/nimlangserver/package.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ni/nimlangserver/lock.json b/pkgs/by-name/ni/nimlangserver/lock.json index f2235cbc94bf..8088890d9ff0 100644 --- a/pkgs/by-name/ni/nimlangserver/lock.json +++ b/pkgs/by-name/ni/nimlangserver/lock.json @@ -184,11 +184,11 @@ }, { "method": "fetchzip", - "path": "/nix/store/2ksmfd7p93a1a7ibcv3qzsk8h3c3shz7-source", - "rev": "845b6af28b9f68f02d320e03ad18eccccea7ddb9", - "sha256": "1c55kl05pbavm9v5dv42n43sql9qcrblhh3hnp99p5xmlv20c9vf", + "path": "/nix/store/y97vkzpip50iy91xdgv7v7kg04afxn7x-source", + "rev": "8b51e99b4a57fcfb31689230e75595f024543024", + "sha256": "00bg4chz69hllj9ig3qd38ps9l3hcziwj9kgykhbdcavgw5llzbg", "srcDir": "", - "url": "https://github.com/status-im/nim-unittest2/archive/845b6af28b9f68f02d320e03ad18eccccea7ddb9.tar.gz", + "url": "https://github.com/status-im/nim-unittest2/archive/8b51e99b4a57fcfb31689230e75595f024543024.tar.gz", "subDir": "", "packages": [ "unittest2" diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix index 4d6785d9ac57..11ec0284cfbc 100644 --- a/pkgs/by-name/ni/nimlangserver/package.nix +++ b/pkgs/by-name/ni/nimlangserver/package.nix @@ -6,7 +6,7 @@ buildNimPackage ( final: prev: rec { pname = "nimlangserver"; - version = "1.12.0"; + version = "1.14.0"; # nix build ".#nimlangserver.src" # nix run "github:daylinmorgan/nnl" -- result/nimble.lock -o:pkgs/by-name/ni/nimlangserver/lock.json --git,=,bearssl,zlib @@ -16,7 +16,7 @@ buildNimPackage ( owner = "nim-lang"; repo = "langserver"; rev = "v${version}"; - hash = "sha256-yf3oiKwsJoQxRPhbEBMJN+TR7j58t6ggjq51DJ3ypGQ="; + hash = "sha256-IJbuM/AhPgyfe/1ONY8Nb46+gqjduVQOvkgGafgkhY4="; }; doCheck = false; From f8637ce0f82482c6d2922646c8f410356b3c2929 Mon Sep 17 00:00:00 2001 From: Harinn Date: Fri, 8 May 2026 21:26:29 +0700 Subject: [PATCH 0149/1079] libuiohook: fix build with gcc 15 --- pkgs/by-name/li/libuiohook/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/li/libuiohook/package.nix b/pkgs/by-name/li/libuiohook/package.nix index 63008f738ad5..7cee3840645d 100644 --- a/pkgs/by-name/li/libuiohook/package.nix +++ b/pkgs/by-name/li/libuiohook/package.nix @@ -63,6 +63,11 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_TEST:BOOL=ON" ]; + # Mismatched arg counts in tests break under gcc 15's C23 default. + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-std=gnu17"; + }; + postInstall = '' mkdir -p $test/share cp ./uiohook_tests $test/share From 6951377e1d8c8e51f255199ad8d124d739851925 Mon Sep 17 00:00:00 2001 From: "xiaodong.jia" Date: Sat, 9 May 2026 00:13:39 +0800 Subject: [PATCH 0150/1079] nixos/prometheus-exporters: use finalAttrs pattern --- pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix b/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix index 844872009ef0..8eee84e785da 100644 --- a/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix @@ -4,15 +4,15 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { __structuredAttrs = true; pname = "prometheus-speedtest-exporter"; - version = "v1.0.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "podocarp"; repo = "speedtest_exporter"; - rev = version; + tag = "v${finalAttrs.version}"; hash = "sha256-n9eunZRssS13mTOeFeZ/PpfSj430DKf3ZRS10hY4Ps8="; }; @@ -25,4 +25,4 @@ buildGoModule rec { license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ podocarp ]; }; -} +}) From db75133b96496e0a4acf01ad3678565f6ea6d3d9 Mon Sep 17 00:00:00 2001 From: fxai Date: Fri, 8 May 2026 12:14:02 +0200 Subject: [PATCH 0151/1079] subjack: init at 3.0.0 --- pkgs/by-name/su/subjack/package.nix | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/su/subjack/package.nix diff --git a/pkgs/by-name/su/subjack/package.nix b/pkgs/by-name/su/subjack/package.nix new file mode 100644 index 000000000000..8349159a72a0 --- /dev/null +++ b/pkgs/by-name/su/subjack/package.nix @@ -0,0 +1,30 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "subjack"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "haccer"; + repo = "subjack"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AHzBPtMpXy8ZG+lh7PpcvkJkdUal3ONhEQIhMVFSx+A="; + }; + + vendorHash = "sha256-Ma4kAcMfYm1ltOaAX39j78lxaAnWq03FYyB6rnKv9y8="; + + __structuredAttrs = true; + + meta = { + description = "DNS Takeover Scanner written in Go"; + mainProgram = "subjack"; + homepage = "https://github.com/haccer/subjack"; + license = lib.licenses.asl20; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ fxai ]; + }; +}) From a689c61315d45ec7f7785503dd3a8e6602323741 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Fri, 8 May 2026 09:41:10 -0700 Subject: [PATCH 0152/1079] ophcrack: fix darwin build --- pkgs/by-name/op/ophcrack/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/op/ophcrack/package.nix b/pkgs/by-name/op/ophcrack/package.nix index 4a6c6b79ccd6..31b341415cc0 100644 --- a/pkgs/by-name/op/ophcrack/package.nix +++ b/pkgs/by-name/op/ophcrack/package.nix @@ -50,6 +50,11 @@ stdenv.mkDerivation (finalAttrs: { [ "--disable-gui" ] ); + installPhase = lib.optional (stdenv.hostPlatform.isDarwin && enableGui) '' + mkdir -p $out/Applications + cp -R src/ophcrack.app $out/Applications/ophcrack.app + ''; + meta = { description = "Free Windows password cracker based on rainbow tables"; homepage = "https://ophcrack.sourceforge.io"; From f72ac56df28d638720d76b98e845e3855a2031b8 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 6 May 2026 09:27:18 -0300 Subject: [PATCH 0153/1079] dotnet: fix indentation in update scripts --- .../compilers/dotnet/binary/update.sh | 522 +++++++++--------- .../compilers/dotnet/source/update.sh | 238 ++++---- 2 files changed, 380 insertions(+), 380 deletions(-) diff --git a/pkgs/development/compilers/dotnet/binary/update.sh b/pkgs/development/compilers/dotnet/binary/update.sh index 116fed9c9aad..63ad985e965f 100755 --- a/pkgs/development/compilers/dotnet/binary/update.sh +++ b/pkgs/development/compilers/dotnet/binary/update.sh @@ -10,94 +10,94 @@ trap 'exit 1' ERR rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) release () { - local content="$1" - local version="$2" + local content="$1" + local version="$2" - jq -er '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" + jq -er '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" } release_files () { - local release="$1" - local expr="$2" + local release="$1" + local expr="$2" - jq -er '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" + jq -er '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" } release_platform_attr () { - local release_files="$1" - local platform="$2" - local attr="$3" + local release_files="$1" + local platform="$2" + local attr="$3" - jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("-composite-") or contains("-pack-") | not)) | ."'"$attr"'"' <<< "$release_files" + jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("-composite-") or contains("-pack-") | not)) | ."'"$attr"'"' <<< "$release_files" } platform_sources () { - local release_files="$1" + local release_files="$1" - echo "srcs = {" - for rid in "${rids[@]}"; do - local url hash + echo "srcs = {" + for rid in "${rids[@]}"; do + local url hash - url=$(release_platform_attr "$release_files" "$rid" url) - hash=$(release_platform_attr "$release_files" "$rid" hash) + url=$(release_platform_attr "$release_files" "$rid" url) + hash=$(release_platform_attr "$release_files" "$rid" hash) - [[ -z "$url" || -z "$hash" ]] && continue + [[ -z "$url" || -z "$hash" ]] && continue - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") - echo " $rid = { + echo " $rid = { url = \"$url\"; hash = \"$hash\"; };" - done - echo " };" + done + echo " };" } nuget_index="$(curl -fsSL "https://api.nuget.org/v3/index.json")" get_nuget_resource() { - jq -er '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index" + jq -er '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index" } nuget_package_base_url="$(get_nuget_resource "PackageBaseAddress/3.0.0")" nuget_registration_base_url="$(get_nuget_resource "RegistrationsBaseUrl/3.6.0")" generate_package_list() { - local version="$1" indent="$2" - shift 2 - local pkgs=( "$@" ) pkg url hash catalog_url catalog hash_algorithm + local version="$1" indent="$2" + shift 2 + local pkgs=( "$@" ) pkg url hash catalog_url catalog hash_algorithm - for pkg in "${pkgs[@]}"; do - url=${nuget_package_base_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg + for pkg in "${pkgs[@]}"; do + url=${nuget_package_base_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg - if hash=$(curl -s --head "$url" -o /dev/null -w '%header{x-ms-meta-sha512}') && [[ -n "$hash" ]]; then - # Undocumented fast path for nuget.org - # https://github.com/NuGet/NuGetGallery/issues/9433#issuecomment-1472286080 - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") - elif { - catalog_url=$(curl -sL --compressed "${nuget_registration_base_url}${pkg,,}/${version,,}.json" | jq -r ".catalogEntry") && [[ -n "$catalog_url" ]] && - catalog=$(curl -sL "$catalog_url") && [[ -n "$catalog" ]] && - hash_algorithm="$(jq -er '.packageHashAlgorithm' <<<"$catalog")"&& [[ -n "$hash_algorithm" ]] && - hash=$(jq -er '.packageHash' <<<"$catalog") && [[ -n "$hash" ]] - }; then - # Documented but slower path (requires 2 requests) - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo "${hash_algorithm,,}" "$hash") - elif hash=$(nix-prefetch-url "$url" --type sha512); then - # Fallback to downloading and hashing locally - echo "Failed to fetch hash from nuget for $url, falling back to downloading locally" >&2 - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") - else - echo "Failed to fetch hash for $url" >&2 - exit 1 - fi + if hash=$(curl -s --head "$url" -o /dev/null -w '%header{x-ms-meta-sha512}') && [[ -n "$hash" ]]; then + # Undocumented fast path for nuget.org + # https://github.com/NuGet/NuGetGallery/issues/9433#issuecomment-1472286080 + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") + elif { + catalog_url=$(curl -sL --compressed "${nuget_registration_base_url}${pkg,,}/${version,,}.json" | jq -r ".catalogEntry") && [[ -n "$catalog_url" ]] && + catalog=$(curl -sL "$catalog_url") && [[ -n "$catalog" ]] && + hash_algorithm="$(jq -er '.packageHashAlgorithm' <<<"$catalog")"&& [[ -n "$hash_algorithm" ]] && + hash=$(jq -er '.packageHash' <<<"$catalog") && [[ -n "$hash" ]] + }; then + # Documented but slower path (requires 2 requests) + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo "${hash_algorithm,,}" "$hash") + elif hash=$(nix-prefetch-url "$url" --type sha512); then + # Fallback to downloading and hashing locally + echo "Failed to fetch hash from nuget for $url, falling back to downloading locally" >&2 + hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha512 "$hash") + else + echo "Failed to fetch hash for $url" >&2 + exit 1 + fi - echo "$indent(fetchNupkg { pname = \"${pkg}\"; version = \"${version}\"; hash = \"${hash}\"; })" - done + echo "$indent(fetchNupkg { pname = \"${pkg}\"; version = \"${version}\"; hash = \"${hash}\"; })" + done } versionAtLeast () { - local cur_version=$1 min_version=$2 - printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC + local cur_version=$1 min_version=$2 + printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC } # These packages are implicitly references by the build process, @@ -123,120 +123,120 @@ versionAtLeast () { # This should not happend in minor or bugfix updates, but probably happens # with every new major .NET release. aspnetcore_packages () { - local version=$1 - local pkgs=( - Microsoft.AspNetCore.App.Ref + local version=$1 + local pkgs=( + Microsoft.AspNetCore.App.Ref + ) + + if versionAtLeast "$version" 10; then + pkgs+=( + Microsoft.AspNetCore.App.Internal.Assets ) + fi - if versionAtLeast "$version" 10; then - pkgs+=( - Microsoft.AspNetCore.App.Internal.Assets - ) - fi - - generate_package_list "$version" ' ' "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } aspnetcore_target_packages () { - local version=$1 - local rid=$2 - local pkgs=( - "Microsoft.AspNetCore.App.Runtime.$rid" - ) + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.AspNetCore.App.Runtime.$rid" + ) - generate_package_list "$version" ' ' "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } netcore_packages () { - local version=$1 - local pkgs=( - Microsoft.NETCore.DotNetAppHost - Microsoft.NETCore.App.Ref + local version=$1 + local pkgs=( + Microsoft.NETCore.DotNetAppHost + Microsoft.NETCore.App.Ref + ) + + if ! versionAtLeast "$version" 9; then + pkgs+=( + Microsoft.NETCore.DotNetHost + Microsoft.NETCore.DotNetHostPolicy + Microsoft.NETCore.DotNetHostResolver ) + fi - if ! versionAtLeast "$version" 9; then - pkgs+=( - Microsoft.NETCore.DotNetHost - Microsoft.NETCore.DotNetHostPolicy - Microsoft.NETCore.DotNetHostResolver - ) - fi + if versionAtLeast "$version" 7; then + pkgs+=( + Microsoft.DotNet.ILCompiler + ) + fi - if versionAtLeast "$version" 7; then - pkgs+=( - Microsoft.DotNet.ILCompiler - ) - fi + if versionAtLeast "$version" 8; then + pkgs+=( + Microsoft.NET.ILLink.Tasks + ) + fi - if versionAtLeast "$version" 8; then - pkgs+=( - Microsoft.NET.ILLink.Tasks - ) - fi - - generate_package_list "$version" ' ' "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } netcore_host_packages () { - local version=$1 - local rid=$2 - local pkgs=( - "Microsoft.NETCore.App.Crossgen2.$rid" + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.NETCore.App.Crossgen2.$rid" + ) + + local min_ilcompiler= + case "$rid" in + linux-musl-arm) ;; + linux-arm) ;; + win-x86) ;; + osx-arm64) min_ilcompiler=8 ;; + *) min_ilcompiler=7 ;; + esac + + if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then + pkgs+=( + "runtime.$rid.Microsoft.DotNet.ILCompiler" ) + fi - local min_ilcompiler= - case "$rid" in - linux-musl-arm) ;; - linux-arm) ;; - win-x86) ;; - osx-arm64) min_ilcompiler=8 ;; - *) min_ilcompiler=7 ;; - esac - - if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then - pkgs+=( - "runtime.$rid.Microsoft.DotNet.ILCompiler" - ) - fi - - generate_package_list "$version" ' ' "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } netcore_target_packages () { - local version=$1 - local rid=$2 - local pkgs=( - "Microsoft.NETCore.App.Host.$rid" - "Microsoft.NETCore.App.Runtime.$rid" - "runtime.$rid.Microsoft.NETCore.DotNetAppHost" + local version=$1 + local rid=$2 + local pkgs=( + "Microsoft.NETCore.App.Host.$rid" + "Microsoft.NETCore.App.Runtime.$rid" + "runtime.$rid.Microsoft.NETCore.DotNetAppHost" + ) + + if ! versionAtLeast "$version" 9; then + pkgs+=( + "runtime.$rid.Microsoft.NETCore.DotNetHost" + "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" + "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" ) + case "$rid" in + linux-musl-arm*) ;; + win-arm64) ;; + *) pkgs+=( + "Microsoft.NETCore.App.Runtime.Mono.$rid" + ) ;; + esac + fi - if ! versionAtLeast "$version" 9; then - pkgs+=( - "runtime.$rid.Microsoft.NETCore.DotNetHost" - "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" - "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" - ) - case "$rid" in - linux-musl-arm*) ;; - win-arm64) ;; - *) pkgs+=( - "Microsoft.NETCore.App.Runtime.Mono.$rid" - ) ;; - esac - fi + if versionAtLeast "$version" 10; then + pkgs+=( + "Microsoft.NETCore.App.Runtime.NativeAOT.$rid" + ) + fi - if versionAtLeast "$version" 10; then - pkgs+=( - "Microsoft.NETCore.App.Runtime.NativeAOT.$rid" - ) - fi - - generate_package_list "$version" ' ' "${pkgs[@]}" + generate_package_list "$version" ' ' "${pkgs[@]}" } usage () { - echo "Usage: $pname [[--sdk] [-o output] sem-version] ... + echo "Usage: $pname [[--sdk] [-o output] sem-version] ... Get updated dotnet src (platform - url & sha512) expressions for specified versions Exit codes: @@ -251,61 +251,61 @@ Examples: } update() { - local -r sem_version=$1 sdk=$2 - local output=$3 + local -r sem_version=$1 sdk=$2 + local output=$3 - local patch_specified=false - # Check if a patch was specified as an argument. - # If so, generate file for the specific version. - # If only x.y version was provided, get the latest patch - # version of the given x.y version. - if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then - patch_specified=true - elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then - usage - return 1 - fi + local patch_specified=false + # Check if a patch was specified as an argument. + # If so, generate file for the specific version. + # If only x.y version was provided, get the latest patch + # version of the given x.y version. + if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,} ]]; then + patch_specified=true + elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then + usage + return 1 + fi - : ${output:="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"/../$sem_version/releases.nix} - echo "Generating $output" + : ${output:="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"/../$sem_version/releases.nix} + echo "Generating $output" - # Make sure the x.y version is properly passed to .NET release metadata url. - # Then get the json file and parse it to find the latest patch release. - local major_minor content major_minor_patch - major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") - content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) - if [[ -n $sdk ]]; then - trap '' ERR - major_minor_patch=$( - jq -er --arg version "$sem_version" ' + # Make sure the x.y version is properly passed to .NET release metadata url. + # Then get the json file and parse it to find the latest patch release. + local major_minor content major_minor_patch + major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") + content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) + if [[ -n $sdk ]]; then + trap '' ERR + major_minor_patch=$( + jq -er --arg version "$sem_version" ' .releases[] | select(.sdks[].version == $version) | ."release-version"' <<< "$content" || if [[ $? == 4 ]]; then exit 2; else exit 1; fi) - trap 'exit 1' ERR - else - major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -er '."latest-release"' <<< "$content") - fi - local major_minor_underscore=${major_minor/./_} + trap 'exit 1' ERR + else + major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -er '."latest-release"' <<< "$content") + fi + local major_minor_underscore=${major_minor/./_} - local release_content aspnetcore_version runtime_version - local -a sdk_versions + local release_content aspnetcore_version runtime_version + local -a sdk_versions - release_content=$(release "$content" "$major_minor_patch") - aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content") - runtime_version=$(jq -er '.runtime.version' <<< "$release_content") + release_content=$(release "$content" "$major_minor_patch") + aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content") + runtime_version=$(jq -er '.runtime.version' <<< "$release_content") - if [[ -n $sdk ]]; then - sdk_versions=("$sem_version") - else - mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn) - fi + if [[ -n $sdk ]]; then + sdk_versions=("$sem_version") + else + mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn) + fi - # If patch was not specified, check if the package is already the latest version - # If it is, exit early - if [ "$patch_specified" == false ] && [ -f "$output" ]; then - local -a versions - IFS= readarray -d '' versions < <( - nix-instantiate --eval --json -E "{ output }: with (import output { + # If patch was not specified, check if the package is already the latest version + # If it is, exit early + if [ "$patch_specified" == false ] && [ -f "$output" ]; then + local -a versions + IFS= readarray -d '' versions < <( + nix-instantiate --eval --json -E "{ output }: with (import output { buildAspNetCore = { ... }: {}; buildNetSdk = { version, ... }: { inherit version; }; buildNetRuntime = { version, ... }: { inherit version; }; @@ -314,54 +314,54 @@ update() { runtime_${major_minor_underscore}.version sdk_${major_minor_underscore}.version ]" --argstr output "$output" | jq -e --raw-output0 .[]) - if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then - echo "Nothing to update." - return - fi + if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then + echo "Nothing to update." + return fi + fi - local aspnetcore_files runtime_files - aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" - runtime_files="$(release_files "$release_content" .runtime)" + local aspnetcore_files runtime_files + aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" + runtime_files="$(release_files "$release_content" .runtime)" - local channel_version support_phase - channel_version=$(jq -er '."channel-version"' <<< "$content") - support_phase=$(jq -er '."support-phase"' <<< "$content") + local channel_version support_phase + channel_version=$(jq -er '."channel-version"' <<< "$content") + support_phase=$(jq -er '."support-phase"' <<< "$content") - local aspnetcore_sources runtime_sources - aspnetcore_sources="$(platform_sources "$aspnetcore_files")" - runtime_sources="$(platform_sources "$runtime_files")" + local aspnetcore_sources runtime_sources + aspnetcore_sources="$(platform_sources "$aspnetcore_files")" + runtime_sources="$(platform_sources "$runtime_files")" - result=$(mktemp -t dotnet-XXXXXX.nix) - trap "rm -f $result" TERM INT EXIT + result=$(mktemp -t dotnet-XXXXXX.nix) + trap "rm -f $result" TERM INT EXIT - ( - echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: + ( + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, fetchNupkg }: # v$channel_version ($support_phase) let commonPackages = [" - aspnetcore_packages "${aspnetcore_version}" - netcore_packages "${runtime_version}" - echo " ]; + aspnetcore_packages "${aspnetcore_version}" + netcore_packages "${runtime_version}" + echo " ]; hostPackages = {" - for rid in "${rids[@]}"; do - echo " $rid = [" - netcore_host_packages "${runtime_version}" "$rid" - echo " ];" - done - echo " }; + for rid in "${rids[@]}"; do + echo " $rid = [" + netcore_host_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; targetPackages = {" - for rid in "${rids[@]}"; do - echo " $rid = [" - aspnetcore_target_packages "${aspnetcore_version}" "$rid" - netcore_target_packages "${runtime_version}" "$rid" - echo " ];" - done - echo " }; + for rid in "${rids[@]}"; do + echo " $rid = [" + aspnetcore_target_packages "${aspnetcore_version}" "$rid" + netcore_target_packages "${runtime_version}" "$rid" + echo " ];" + done + echo " }; in rec { release_$major_minor_underscore = \"$major_minor_patch\"; @@ -376,22 +376,22 @@ in rec { $runtime_sources };" - local -A feature_bands - unset latest_sdk + local -A feature_bands + unset latest_sdk - for sdk_version in "${sdk_versions[@]}"; do - local sdk_base_version=${sdk_version%-*} - local feature_band=${sdk_base_version:0:-2}xx - # sometimes one release has e.g. both 8.0.202 and 8.0.203 - [[ ! ${feature_bands[$feature_band]+true} ]] || continue - feature_bands[$feature_band]=$sdk_version - local sdk_files sdk_sources - sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" - sdk_sources="$(platform_sources "$sdk_files")" - local sdk_attrname=sdk_${feature_band//./_} - [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname + for sdk_version in "${sdk_versions[@]}"; do + local sdk_base_version=${sdk_version%-*} + local feature_band=${sdk_base_version:0:-2}xx + # sometimes one release has e.g. both 8.0.202 and 8.0.203 + [[ ! ${feature_bands[$feature_band]+true} ]] || continue + feature_bands[$feature_band]=$sdk_version + local sdk_files sdk_sources + sdk_files="$(release_files "$release_content" ".sdks[] | select(.version == \"$sdk_version\")")" + sdk_sources="$(platform_sources "$sdk_files")" + local sdk_attrname=sdk_${feature_band//./_} + [[ -v latest_sdk ]] || local latest_sdk=$sdk_attrname - echo " + echo " $sdk_attrname = buildNetSdk { version = \"${sdk_version}\"; $sdk_sources @@ -399,49 +399,49 @@ in rec { runtime = runtime_$major_minor_underscore; aspnetcore = aspnetcore_$major_minor_underscore; };" - done + done - if [[ -n $sdk ]]; then - echo " + if [[ -n $sdk ]]; then + echo " sdk = sdk_$major_minor_underscore; " - fi + fi - echo " + echo " sdk_$major_minor_underscore = $latest_sdk; }" - )> "$result" + )> "$result" - nixfmt "$result" - mkdir -p "$(dirname -- "$output")" - cp "$result" "$output" - echo "Generated $output" + nixfmt "$result" + mkdir -p "$(dirname -- "$output")" + cp "$result" "$output" + echo "Generated $output" } main () { - local pname sdk output - pname=$(basename "$0") + local pname sdk output + pname=$(basename "$0") - sdk= - output= + sdk= + output= - while [ $# -gt 0 ]; do - case $1 in - --sdk) - shift - sdk=1 - ;; - -o) - shift - output=$1 - shift - ;; - *) - update "$1" "$sdk" "$output" - shift - ;; - esac - done + while [ $# -gt 0 ]; do + case $1 in + --sdk) + shift + sdk=1 + ;; + -o) + shift + output=$1 + shift + ;; + *) + update "$1" "$sdk" "$output" + shift + ;; + esac + done } main "$@" diff --git a/pkgs/development/compilers/dotnet/source/update.sh b/pkgs/development/compilers/dotnet/source/update.sh index fc78d31aab08..585f45e71f19 100755 --- a/pkgs/development/compilers/dotnet/source/update.sh +++ b/pkgs/development/compilers/dotnet/source/update.sh @@ -3,30 +3,30 @@ set -euo pipefail updateSdk() { - tag=${1-} + tag=${1-} - if [[ -n $tag ]]; then - query=$(cat <&2 echo "release is already $tagName" - exit - } + [[ ! -e "$output"/release.json || $(jq -r .tag "$output"/release.json) != "$tagName" ]] || { + >&2 echo "release is already $tagName" + exit + } - # TMPDIR might be really long, which breaks gpg - tmp="$(TMPDIR=/tmp mktemp -d)" - trap 'rm -rf "$tmp"' EXIT + # TMPDIR might be really long, which breaks gpg + tmp="$(TMPDIR=/tmp mktemp -d)" + trap 'rm -rf "$tmp"' EXIT - cd "$tmp" + cd "$tmp" - curl -fsSL "$releaseUrl" -o release.json + curl -fsSL "$releaseUrl" -o release.json - tarballUrl=https://github.com/dotnet/dotnet/archive/refs/tags/$tagName.tar.gz + tarballUrl=https://github.com/dotnet/dotnet/archive/refs/tags/$tagName.tar.gz - mapfile -t prefetch < <(nix-prefetch-url --print-path "$tarballUrl") - tarballHash=$(nix-hash --to-sri --type sha256 "${prefetch[0]}") - tarball=${prefetch[1]} + mapfile -t prefetch < <(nix-prefetch-url --print-path "$tarballUrl") + tarballHash=$(nix-hash --to-sri --type sha256 "${prefetch[0]}") + tarball=${prefetch[1]} - # recent dotnet 10 releases don't have a signature for the github tarball - if [[ ! $sigUrl = */dotnet-source-* ]]; then - curl -fssL "$sigUrl" -o release.sig - curl -fssLO https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc - echo '17aebc401e7999dd0642fa06d23780eba15bd916ebb118454f34db5c85f7194a release-key-2023.asc' | - sha256sum -c + # recent dotnet 10 releases don't have a signature for the github tarball + if [[ ! $sigUrl = */dotnet-source-* ]]; then + curl -fssL "$sigUrl" -o release.sig + curl -fssLO https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc + echo '17aebc401e7999dd0642fa06d23780eba15bd916ebb118454f34db5c85f7194a release-key-2023.asc' | + sha256sum -c - ( - export GNUPGHOME=$PWD/.gnupg - mkdir -m 700 -p $GNUPGHOME - trap 'gpgconf --kill all' EXIT - gpg --no-autostart --batch --import release-key-2023.asc - gpg --no-autostart --batch --verify release.sig "$tarball" - ) - fi + ( + export GNUPGHOME=$PWD/.gnupg + mkdir -m 700 -p $GNUPGHOME + trap 'gpgconf --kill all' EXIT + gpg --no-autostart --batch --import release-key-2023.asc + gpg --no-autostart --batch --verify release.sig "$tarball" + ) + fi - tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh - artifactsVersion=$(xq -r '.Project.PropertyGroup | + tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh + artifactsVersion=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsVersion)) | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) - if [[ "$artifactsVersion" != "" ]]; then - artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh) - eval "$artifactVar" + if [[ "$artifactsVersion" != "" ]]; then + artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh) + eval "$artifactVar" - artifactsFile=Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz + artifactsFile=Private.SourceBuilt.Artifacts.$artifactsVersion.$defaultArtifactsRid.tar.gz - dotnetBuildUrl=https://builds.dotnet.microsoft.com/ + dotnetBuildUrl=https://builds.dotnet.microsoft.com/ - if [[ $major -ge 10 ]]; then - dotnetBuildUrl+=dotnet/source-build - else - dotnetBuildUrl+=source-built-artifacts/assets - fi + if [[ $major -ge 10 ]]; then + dotnetBuildUrl+=dotnet/source-build + else + dotnetBuildUrl+=source-built-artifacts/assets + fi - artifactsUrl=$dotnetBuildUrl/$artifactsFile + artifactsUrl=$dotnetBuildUrl/$artifactsFile - curl -fsSL "$artifactsUrl" --head || { - [[ $? == 22 ]] - artifactsUrl=https://ci.dot.net/public/source-build/$artifactsFile - } - else - artifactsUrl=$(xq -r '.Project.PropertyGroup | + curl -fsSL "$artifactsUrl" --head || { + [[ $? == 22 ]] + artifactsUrl=https://ci.dot.net/public/source-build/$artifactsFile + } + else + artifactsUrl=$(xq -r '.Project.PropertyGroup | map(select(.PrivateSourceBuiltArtifactsUrl)) | .[] | .PrivateSourceBuiltArtifactsUrl' eng/Versions.props) - artifactsUrl="${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}" - fi + artifactsUrl="${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}" + fi - artifactsHash=$(nix-prefetch-url "$artifactsUrl") - artifactsHash=$(nix-hash --to-sri --type sha256 "$artifactsHash") + artifactsHash=$(nix-prefetch-url "$artifactsUrl") + artifactsHash=$(nix-hash --to-sri --type sha256 "$artifactsHash") - sdkVersion=$(jq -er .tools.dotnet global.json) + sdkVersion=$(jq -er .tools.dotnet global.json) - # below needs to be run in nixpkgs because toOutputPath uses relative paths - cd - + # below needs to be run in nixpkgs because toOutputPath uses relative paths + cd - - cp "$tmp"/release.json "$output" + cp "$tmp"/release.json "$output" - jq --null-input \ - --arg _0 "$tarballHash" \ - --arg _1 "$artifactsUrl" \ - --arg _2 "$artifactsHash" \ - '{ - "tarballHash": $_0, - "artifactsUrl": $_1, - "artifactsHash": $_2, - }' > "$output"/release-info.json + jq --null-input \ + --arg _0 "$tarballHash" \ + --arg _1 "$artifactsUrl" \ + --arg _2 "$artifactsHash" \ + '{ + "tarballHash": $_0, + "artifactsUrl": $_1, + "artifactsHash": $_2, + }' > "$output"/release-info.json - if [[ $band == 1xx ]]; then - getBootstrap() { - pkgs/development/compilers/dotnet/binary/update.sh \ - -o "$output"/bootstrap-sdk.nix --sdk "$1" >&2 - } + if [[ $band == 1xx ]]; then + getBootstrap() { + pkgs/development/compilers/dotnet/binary/update.sh \ + -o "$output"/bootstrap-sdk.nix --sdk "$1" >&2 + } - getBootstrap "$sdkVersion" || if [[ $? == 2 ]]; then - >&2 echo "WARNING: bootstrap sdk missing, attempting to bootstrap with self" - getBootstrap "$(jq -er .sdkVersion "$tmp"/release.json)" - else - exit 1 - fi + getBootstrap "$sdkVersion" || if [[ $? == 2 ]]; then + >&2 echo "WARNING: bootstrap sdk missing, attempting to bootstrap with self" + getBootstrap "$(jq -er .sdkVersion "$tmp"/release.json)" + else + exit 1 + fi - $(nix-build -A dotnetCorePackages.dotnet_$major.vmr.fetch-deps --no-out-link) >&2 - fi - ) + $(nix-build -A dotnetCorePackages.dotnet_$major.vmr.fetch-deps --no-out-link) >&2 + fi + ) } while [ $# -gt 0 ]; do - channel="$1" - shift + channel="$1" + shift - major="${channel%.*}" + major="${channel%.*}" - if [[ $major -lt 8 ]]; then - >&2 echo "dotnet $major has no vmr" + if [[ $major -lt 8 ]]; then + >&2 echo "dotnet $major has no vmr" + continue + fi + + curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$channel"/releases.json | + jq -r '.releases[0].sdks.[] | .version' | { + while read sdk; do + if [[ $major -lt 10 && $sdk != *.*.1* ]]; then + >&2 echo "sdk $sdk has no vmr" continue - fi + fi - curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$channel"/releases.json | - jq -r '.releases[0].sdks.[] | .version' | { - while read sdk; do - if [[ $major -lt 10 && $sdk != *.*.1* ]]; then - >&2 echo "sdk $sdk has no vmr" - continue - fi - - updateSdk v"$sdk" - done - } + updateSdk v"$sdk" + done + } done From 5a2c4a386e482fe0a217d4a29aec9fcc21b60cac Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 8 May 2026 15:12:55 -0300 Subject: [PATCH 0154/1079] dotnet: don't evaluate missing packages This allows the update scripts to work when the generated files have been removed. --- pkgs/development/compilers/dotnet/default.nix | 2 -- pkgs/development/compilers/dotnet/dotnet.nix | 9 +++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index b0629746d176..3eadb90bfa24 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -84,12 +84,10 @@ makeScopeWithSplicing' { let dotnet_6 = callWithUtils ./dotnet.nix { channel = "6.0"; - withVMR = false; }; dotnet_7 = callWithUtils ./dotnet.nix { channel = "7.0"; - withVMR = false; }; dotnet_8 = callWithUtils ./dotnet.nix { diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix index b484ef3e3ef4..fd9783f9d980 100644 --- a/pkgs/development/compilers/dotnet/dotnet.nix +++ b/pkgs/development/compilers/dotnet/dotnet.nix @@ -5,12 +5,17 @@ channel, dir ? ./. + ("/" + channel), buildDotnetSdk, - withVMR ? true, ... }@attrs: let - binary = buildDotnetSdk (dir + "/releases.nix"); + binary = + let + path = dir + "/releases.nix"; + in + if lib.pathExists path then buildDotnetSdk path else { }; + + withVMR = lib.pathExists (dir + "/release.json"); sourcePackages = lib.optionalAttrs withVMR (callPackage ./source (attrs // { inherit binary; })); From 43d0eaac89a0246a1760f12d0aaa2a7e604c8811 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 8 May 2026 21:29:45 +0100 Subject: [PATCH 0155/1079] honggfuzz: 2.6 -> 2.6-unstable-2026-04-13 `honggfuzz` stopped doing tagged releases. Let's use latest `master` instead. This update fixes the build fialure against latest `binutils` in `master`: https://hydra.nixos.org/build/327016208 ``` linux/bfd.c: In function 'arch_bfdDisasm': linux/bfd.c:233:51: error: incompatible type for argument 1 of 'disassembler' 233 | disassembler_ftype disassemble = disassembler(bfdh); | ^~~~ | | | bfd * ``` --- pkgs/by-name/ho/honggfuzz/package.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ho/honggfuzz/package.nix b/pkgs/by-name/ho/honggfuzz/package.nix index c18b2b88f951..72f7330a77a6 100644 --- a/pkgs/by-name/ho/honggfuzz/package.nix +++ b/pkgs/by-name/ho/honggfuzz/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, makeWrapper, clang, llvm, @@ -10,27 +9,20 @@ libopcodes, libunwind, libblocksruntime, + unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "honggfuzz"; - version = "2.6"; + version = "2.6-unstable-2026-04-13"; src = fetchFromGitHub { owner = "google"; repo = "honggfuzz"; - rev = finalAttrs.version; - sha256 = "sha256-/ra6g0qjjC8Lo8/n2XEbwnZ95yDHcGhYd5+TTvQ6FAc="; + rev = "48790f7b18f30ba4a95272ea290b720662ed56c9"; + hash = "sha256-RHNOZF5ttqdh3daGGVRHkvL9g2aZFDGDmmW056ohI6w="; }; - patches = [ - # [PATCH] mangle: support gcc-15 with __attribute__((nonstring)) - (fetchpatch2 { - url = "https://github.com/google/honggfuzz/commit/4cfa62f4fdb56e3027c1cb3aecf04812e786f0fd.patch?full_index=1"; - hash = "sha256-79/GZfqTH1o/21P7At5ZPmvcCSYWAsVakSv5dNCT+XI="; - }) - ]; - postPatch = '' substituteInPlace hfuzz_cc/hfuzz-cc.c \ --replace '"clang' '"${clang}/bin/clang' @@ -66,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: { cp libhfnetdriver/libhfnetdriver.a $out/lib ''; + passthru.updateScript = unstableGitUpdater { + tagFormat = "[0-9]*"; + }; + meta = { description = "Security oriented, feedback-driven, evolutionary, easy-to-use fuzzer"; longDescription = '' From 197862308f32089bf027713757e8bdfb436a1a24 Mon Sep 17 00:00:00 2001 From: yuannan Date: Fri, 8 May 2026 22:41:23 +0100 Subject: [PATCH 0156/1079] llama-cpp: 8983 -> 9080 --- pkgs/by-name/ll/llama-cpp/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 57dc752361c1..e54476e8784f 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -40,6 +40,7 @@ shaderc, vulkan-headers, vulkan-loader, + spirv-headers, ninja, }: @@ -78,7 +79,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "8983"; + version = "9080"; outputs = [ "out" @@ -89,7 +90,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-v73SfPbzzLBNWyan1dsAnDc2dfSem36zyeGLen5t4KI="; + hash = "sha256-IF2Whu9VLxUbL+oLkQeYERfp8s3RdQBUyqsAsruv60M="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -106,6 +107,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { nodejs npmHooks.npmConfigHook pkg-config + spirv-headers ] ++ optionals cudaSupport [ cudaPackages.cuda_nvcc @@ -121,7 +123,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ [ openssl ]; npmRoot = "tools/server/webui"; - npmDepsHash = "sha256-iYJB0z2YHG8OzEA9EwHUZrDa5obr5m2sbnIH+of28o0="; + npmDepsHash = "sha256-cV3noOyKmst9vfxyvkCNhihPgwfVGhmPPT4UMloeWZM="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src patches; From e8e00aa57136f3bf5405eccfd1273c2b49a50669 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 8 May 2026 18:08:40 +0800 Subject: [PATCH 0157/1079] mysql-shell_8: unpin stdenv --- pkgs/development/tools/mysql-shell/8.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index e144cc8a0b04..0f1253bd4f61 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -75,6 +75,14 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace cmake/libutils.cmake --replace-fail /usr/bin/libtool libtool ''; + env = + lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-literal-operator"; + } + // lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; + }; + nativeBuildInputs = [ pkg-config cmake diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae67292ec8e1..162ef6b5c56f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -549,13 +549,6 @@ with pkgs; protobuf = protobuf_25.override { abseil-cpp = abseil-cpp_202407; }; - stdenv = - if stdenv.cc.isClang then - llvmPackages_19.stdenv - else if stdenv.cc.isGNU then - gcc14Stdenv - else - stdenv; }; mysql-shell_9 = callPackage ../development/tools/mysql-shell/9.nix { From b72b434f0bdb703cf74e0e6dc74482868478f0af Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 9 May 2026 01:36:58 +0000 Subject: [PATCH 0158/1079] mysql-shell_9: unpin stdenv --- pkgs/development/tools/mysql-shell/9.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/9.nix b/pkgs/development/tools/mysql-shell/9.nix index 0ff2adc4f547..e530484240e1 100644 --- a/pkgs/development/tools/mysql-shell/9.nix +++ b/pkgs/development/tools/mysql-shell/9.nix @@ -116,8 +116,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; - env = { - ${if stdenv.cc.isGNU then "NIX_CFLAGS_COMPILE" else null} = "-Wno-error=maybe-uninitialized"; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized -Wno-error=array-bounds"; }; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 162ef6b5c56f..bd8d77df9e8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -557,7 +557,6 @@ with pkgs; protobuf = protobuf_25.override { abseil-cpp = abseil-cpp_202407; }; - stdenv = if stdenv.cc.isGNU then gcc14Stdenv else stdenv; }; }) mysql-shell_8 From 710e70e2154bdf35a55c7db35f2a4bb65dd4946b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 9 May 2026 01:48:25 +0000 Subject: [PATCH 0159/1079] mysql-shell_innovation: unpin stdenv --- pkgs/development/tools/mysql-shell/innovation.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index 4d8428a23539..b02599bfc9f6 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -112,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; - env = { - ${if stdenv.cc.isGNU then "NIX_CFLAGS_COMPILE" else null} = "-Wno-error=maybe-uninitialized"; + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized -Wno-error=array-bounds"; }; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd8d77df9e8a..fbab1d49a855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -569,7 +569,6 @@ with pkgs; protobuf = protobuf_25.override { abseil-cpp = abseil-cpp_202407; }; - stdenv = if stdenv.cc.isGNU then gcc14Stdenv else stdenv; }; # this is used by most `fetch*` functions From 98ef8925823e32395b4156bcbfd700dca33e109b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 9 May 2026 10:54:35 +0800 Subject: [PATCH 0160/1079] cursor-cli: 0-unstable-2026-04-08 -> 0-unstable-2026-05-07 --- pkgs/by-name/cu/cursor-cli/package.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index 63ca93d924fc..329d10288a25 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -3,35 +3,40 @@ fetchurl, stdenv, autoPatchelfHook, + zlib, }: let inherit (stdenv) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/linux/x64/agent-cli-package.tar.gz"; - hash = "sha256-zHNiy5I61cN6BpfRv1TozdRk+2R/RNxIanCPkwqdfZE="; + url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/linux/x64/agent-cli-package.tar.gz"; + hash = "sha256-BTYNvK4UGWL8skJDjFkyBsEjvoUxaxHAlEKtr7gsyhs="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/linux/arm64/agent-cli-package.tar.gz"; - hash = "sha256-xcbIoTunBlL79SgE8h5PeT4HwguHY0UUQTiYdtppv7c="; + url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/linux/arm64/agent-cli-package.tar.gz"; + hash = "sha256-C+JfqTdhDGTxz3rUWH0a+TdUvQq26wAPQ1qN/U2C/0o="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-O9OoPaBBHAAazYnEvHSB8okyDHdEqMu1A0CbUwsw93I="; + url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/darwin/x64/agent-cli-package.tar.gz"; + hash = "sha256-TI74gxQ1VgrSmMvUXXwTQv6ixlALnarYul9DRrU2Arc="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.04.08-a41fba1/darwin/arm64/agent-cli-package.tar.gz"; - hash = "sha256-TGyQxZbn5yGTjqqfrbKRGXCp9MhuEHSV6oNZOIEoZDA="; + url = "https://downloads.cursor.com/lab/2026.05.07-42ddaca/darwin/arm64/agent-cli-package.tar.gz"; + hash = "sha256-b1WL8URL+xtVjxOtJI1W3gAWh3i3cIN98f3aeDX5JlM="; }; }; in stdenv.mkDerivation { pname = "cursor-cli"; - version = "0-unstable-2026-04-08"; + version = "0-unstable-2026-05-07"; src = sources.${hostPlatform.system}; + buildInputs = lib.optionals hostPlatform.isLinux [ + zlib + ]; + nativeBuildInputs = lib.optionals hostPlatform.isLinux [ autoPatchelfHook stdenv.cc.cc.lib From ace7cbee2f5d624aefd7d42ee479764f80dc4927 Mon Sep 17 00:00:00 2001 From: silvanshade Date: Fri, 8 May 2026 23:04:48 -0600 Subject: [PATCH 0161/1079] aube: 1.8.0 -> 1.9.1 --- pkgs/by-name/au/aube/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/au/aube/package.nix b/pkgs/by-name/au/aube/package.nix index ad4b6408c1e9..5a0aae0299f2 100644 --- a/pkgs/by-name/au/aube/package.nix +++ b/pkgs/by-name/au/aube/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aube"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "endevco"; repo = "aube"; tag = "v${finalAttrs.version}"; - hash = "sha256-GiWg0f1LMGH0yEr97w2+p6CpC9zv4ZmP19gMsBlc+8w="; + hash = "sha256-uwOEou6DH+bePNupYKmTc82xQV9T08bDmSPG9RU9yBk="; }; - cargoHash = "sha256-0L8bPxICB816zjZ6k98gg9isHocbb2oSAtDi8o7rG3U="; + cargoHash = "sha256-CBI44O2iMwdMym+ZOO9MvJQ73n+12J6FjzIXAOQTGT0="; nativeBuildInputs = [ cmake ]; # libz-ng-sys From 10367b05a04adc986578d3f08c904f46e6a38474 Mon Sep 17 00:00:00 2001 From: Nathan Mills <38995150+Quipyowert2@users.noreply.github.com> Date: Thu, 7 May 2026 22:51:29 -0700 Subject: [PATCH 0162/1079] endless-sky: 0.11.0 -> 0.11.1 https://github.com/endless-sky/endless-sky/releases/tag/v0.11.1 --- pkgs/by-name/en/endless-sky/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix index 17fdd6fc4410..a33b87f1e4d2 100644 --- a/pkgs/by-name/en/endless-sky/package.nix +++ b/pkgs/by-name/en/endless-sky/package.nix @@ -16,17 +16,18 @@ libmad, libuuid, minizip, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "endless-sky"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; tag = "v${finalAttrs.version}"; - hash = "sha256-zeLM3n6pm5FxT+GO3dtJwDFKHs8boUuQBShU/PDCeFA="; + hash = "sha256-QXLIHAAdpK6lvKv0471KsiB+B06RKUfYoUNYKi8NAlg="; }; patches = [ @@ -63,6 +64,8 @@ stdenv.mkDerivation (finalAttrs: { minizip ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control"; mainProgram = "endless-sky"; From d782f1002a9415ec93b2fa36b55cbc2c55647717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 May 2026 05:23:42 +0000 Subject: [PATCH 0163/1079] python3Packages.temporalio: 1.26.0 -> 1.27.0 --- pkgs/development/python-modules/temporalio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix index 41bcaecd63a8..6e2499f70265 100644 --- a/pkgs/development/python-modules/temporalio/default.nix +++ b/pkgs/development/python-modules/temporalio/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "temporalio"; - version = "1.26.0"; + version = "1.27.0"; pyproject = true; src = fetchFromGitHub { @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "sdk-python"; tag = version; fetchSubmodules = true; - hash = "sha256-mCx7IP3/KUDTzmzgwBIpzi2UFf9gNFxlSrBpOyPm/xs="; + hash = "sha256-UjfEBD0gLqZ+u53j1Chhearpljv+Arxw7Ru5slHA8i8="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -43,7 +43,7 @@ buildPythonPackage rec { src cargoRoot ; - hash = "sha256-CL2ipOgnxGn0Zw2da85BzLJdjYamBXKftiRPExWCbb0="; + hash = "sha256-aWceWxm53DbFv9O7jboPv0oSnRbVx6tObSTlD28fIHc="; }; cargoRoot = "temporalio/bridge"; From 0df999c623ec039dd78efcdd44bea5dd245afdee Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 9 May 2026 15:53:05 +0700 Subject: [PATCH 0164/1079] dopewars: fix build with strict msgfmt --- pkgs/by-name/do/dopewars/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/do/dopewars/package.nix b/pkgs/by-name/do/dopewars/package.nix index 7b9dea613aed..0722c693adf1 100644 --- a/pkgs/by-name/do/dopewars/package.nix +++ b/pkgs/by-name/do/dopewars/package.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: { ./0002-fix_gcc15.patch ]; + preConfigure = '' + substituteInPlace po/Makefile.in.in \ + --replace-fail '$(GMSGFMT) -c --statistics --verbose' '$(GMSGFMT) --statistics --verbose' + ''; + # run dopewars with -f so that it finds its scoreboard file in ~/.local/share postInstall = '' wrapProgram $out/bin/dopewars \ From 84e4400c011e4e8f64639b24eafca0657f7319d0 Mon Sep 17 00:00:00 2001 From: Eric Rodrigues Pires Date: Tue, 5 May 2026 11:44:03 -0300 Subject: [PATCH 0165/1079] nixos/tests/benchexec: disable container mode --- nixos/tests/benchexec.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/benchexec.nix b/nixos/tests/benchexec.nix index 2875588efdf2..d531ceb746fd 100644 --- a/nixos/tests/benchexec.nix +++ b/nixos/tests/benchexec.nix @@ -43,7 +43,8 @@ in --debug \ --read-only-dir / \ --hidden-dir /home \ - '${test}' \ + --no-container \ + -- '${test}' \ '''') benchexec.succeed("grep -s '${echo}' ${wd}/output.log") benchexec.succeed("test \"$(grep -Ec '((start|wall|cpu)time|memory)=' ${stdout})\" = 4") From 74650a5ad1f0f10692d18b470d78a3aa658d89b5 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 9 May 2026 12:00:00 +0000 Subject: [PATCH 0166/1079] bombono: fix build --- pkgs/by-name/bo/bombono/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/bo/bombono/package.nix b/pkgs/by-name/bo/bombono/package.nix index f7fe83f4ab9e..4f2213c4d577 100644 --- a/pkgs/by-name/bo/bombono/package.nix +++ b/pkgs/by-name/bo/bombono/package.nix @@ -49,7 +49,9 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace src/mbase/SConscript \ - --replace "lib_mbase_env['CPPDEFINES']" "list(lib_mbase_env['CPPDEFINES'])" + --replace-fail "lib_mbase_env['CPPDEFINES']" "list(lib_mbase_env['CPPDEFINES'])" + # adapt to recent C standards + substituteInPlace Autoconfig --replace-fail "void (*signal ()) ();" "void (*signal(int, void (*)(int)))(int);" ''; nativeBuildInputs = [ From 69bb196372c81c16c30f1da42ab2dda85a2b2e52 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 9 May 2026 12:00:00 +0000 Subject: [PATCH 0167/1079] gimp2: fix build --- pkgs/applications/graphics/gimp/2.0/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix index 9dd68e31322e..eaa2d87417b3 100644 --- a/pkgs/applications/graphics/gimp/2.0/default.nix +++ b/pkgs/applications/graphics/gimp/2.0/default.nix @@ -149,6 +149,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://salsa.debian.org/gnome-team/gimp/-/raw/4cb293ec1a3b273281d5d9daf94b833c293797d7/debian/patches/CVE-2025-10934.patch"; hash = "sha256-MmYdh74cky/dF3UTHC0xpDW6+aa8Vzh+4ADHCDtIDzo="; }) + (fetchurl { + name = "c23.patch"; + url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/85bdad2b2ca7ba36a01bef945b1c4b193a2fa9d0.patch"; + hash = "sha256-6g2Zhbx+WxX7lOCYAFII0yDbwILecExwFD22tZDED50="; + }) ]; # error: possibly undefined macro: AM_NLS From b32c0d7d4a4d73efc3e1b0fffd0e6edfa788f19a Mon Sep 17 00:00:00 2001 From: Harinn Date: Sat, 9 May 2026 19:03:42 +0700 Subject: [PATCH 0168/1079] jrsonnet: 0.4.2 -> 0.5.0-pre98 --- pkgs/by-name/jr/jrsonnet/package.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/jr/jrsonnet/package.nix b/pkgs/by-name/jr/jrsonnet/package.nix index 63a3de66c531..61efa5875744 100644 --- a/pkgs/by-name/jr/jrsonnet/package.nix +++ b/pkgs/by-name/jr/jrsonnet/package.nix @@ -8,34 +8,28 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jrsonnet"; - version = "0.4.2"; + version = "0.5.0-pre98"; src = fetchFromGitHub { - rev = "v${finalAttrs.version}"; owner = "CertainLach"; repo = "jrsonnet"; - sha256 = "sha256-OX+iJJ3vdCsWWr8x31psV9Vne6xWDZnJc83NbJqMK1A="; + tag = "v${finalAttrs.version}"; + hash = "sha256-2dNzxZnvnw8TsKnnIlHGpuixrqe4z0a4faOBPv2N+ws="; }; - cargoHash = "sha256-DA31NatwQyf3RPpaI38DdAujpRyZfJvoHgr2CZSjH3s="; + cargoHash = "sha256-QPJ1kVk/TftAROiBVBN6J4PZ1pwjtjldtgmJxSTC1Ao="; nativeBuildInputs = [ installShellFiles ]; - # skip flaky tests - checkFlags = [ - "--skip=tests::native_ext" - ]; - postInstall = '' ln -s $out/bin/jrsonnet $out/bin/jsonnet - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' for shell in bash zsh fish; do installShellCompletion --cmd jrsonnet \ - --$shell <($out/bin/jrsonnet --generate $shell /dev/null) + --$shell <($out/bin/jrsonnet generate $shell) installShellCompletion --cmd jsonnet \ - --$shell <($out/bin/jrsonnet --generate $shell /dev/null | sed s/jrsonnet/jsonnet/g) + --$shell <($out/bin/jrsonnet generate $shell | sed s/jrsonnet/jsonnet/g) done ''; From 34e85d8cc273f240fc284faa46c1b69a53237c8c Mon Sep 17 00:00:00 2001 From: kronberger-droid Date: Sat, 9 May 2026 15:29:07 +0200 Subject: [PATCH 0169/1079] rio: 0.3.11 -> 0.4.3 --- pkgs/by-name/ri/rio/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix index 8a4105a7753b..2b63dbd3f87c 100644 --- a/pkgs/by-name/ri/rio/package.nix +++ b/pkgs/by-name/ri/rio/package.nix @@ -11,6 +11,7 @@ cmake, ncurses, scdoc, + shaderc, pkg-config, gcc-unwrapped, fontconfig, @@ -50,16 +51,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "rio"; - version = "0.3.11"; + version = "0.4.3"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; tag = "v${finalAttrs.version}"; - hash = "sha256-mzOgto8ELVrf1RWyL4BoU836HGnMBBeyWwfBFAPgoDE="; + hash = "sha256-br3PiI+b2kpNZuzLg9SBRfKS3uo6FKoPUnKUMOq519s="; }; - cargoHash = "sha256-wO6PCnV95tKsRzyV1kVxxp7pNTsrR92HtNpZYg3U51w="; + cargoHash = "sha256-GzdO+ezGh1xgziW9epKbds0oxf2dYEzospKA648ESN0="; nativeBuildInputs = [ rustPlatform.bindgenHook @@ -71,6 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cmake pkg-config autoPatchelfHook + shaderc ]; runtimeDependencies = rlinkLibs; From 6129439e5abb334e70d838f4e12ce253d18fb217 Mon Sep 17 00:00:00 2001 From: aaravrav <37036762+aaravrav@users.noreply.github.com> Date: Sat, 9 May 2026 19:55:48 +0530 Subject: [PATCH 0170/1079] shufflecake: 0.5.5 -> 0.5.8 --- pkgs/os-specific/linux/shufflecake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index 327fb031e606..a32e61db6c63 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { name = "${finalAttrs.pname}-${finalAttrs.version}-${kernel.version}"; pname = "shufflecake"; - version = "0.5.5"; + version = "0.5.8"; src = fetchFromCodeberg { owner = "shufflecake"; repo = "shufflecake-c"; rev = "v${finalAttrs.version}"; - hash = "sha256-xVuI7tRARPFuETCCKYt507WpvZVZLaj9dhBkhJ03zc8="; + hash = "sha256-eI5tWujUHj9S8d1aOFMuokjVWI2GGEml68cuQ6K0/C8="; }; nativeBuildInputs = kernel.moduleBuildDependencies; From f7c91d08f14a9aa2ff610a8b67d9a6638c4b2785 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sun, 10 May 2026 01:06:55 +0900 Subject: [PATCH 0171/1079] anki: 25.09.3 -> 25.09.4 --- pkgs/by-name/an/anki/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/anki/package.nix b/pkgs/by-name/an/anki/package.nix index 9909f92a97b8..a4fdea9dca4c 100644 --- a/pkgs/by-name/an/anki/package.nix +++ b/pkgs/by-name/an/anki/package.nix @@ -37,10 +37,10 @@ let yarn-berry = yarn-berry_4; pname = "anki"; - version = "25.09.3"; - rev = "3890e12c9e48c028c3f12aa58cb64bd9f8895e30"; + version = "25.09.4"; + rev = "d52ca669f6deac5966b1c5035bc2dc77c78d3260"; - srcHash = "sha256-vpAWrZAXqm775sn1I5unPb8L9cqaRqPrVEc4A8SxPOk="; + srcHash = "sha256-brwJjsqjiCd+QDZoB9Pv3TJxTTAfDm8KtYFvJhJpELk="; cargoHash = "sha256-qcB+r9VzBz6ACZaXPL26MOxxtb/h2OIuxyc54vUgfPM="; yarnHash = "sha256-wi8e9B0EtRMoyH6KhRBNDHM/ffJ+/0Y4f4AZ7eUcXmA="; pythonDeps = From 48c1a30547938b2d03afcb3ea76588985cad3b7e Mon Sep 17 00:00:00 2001 From: whispers Date: Sat, 9 May 2026 11:50:36 -0400 Subject: [PATCH 0172/1079] arti: 2.2.0 -> 2.3.0 Release announcement: https://blog.torproject.org/arti_2_3_0_released/ Changelog: https://gitlab.torproject.org/tpo/core/arti/-/blob/arti-v2.3.0/CHANGELOG.md --- pkgs/by-name/ar/arti/package.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index 184b5c37e262..71b8f3225149 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "arti"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -21,10 +21,17 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "core"; repo = "arti"; tag = "arti-v${finalAttrs.version}"; - hash = "sha256-yV+8P6V9QDDmIekJsa3kUt8Qv2Y/Zfeq2aqcQIGNubg="; + hash = "sha256-OEGKjYJ3p4g0ZfeK6k8IJJPjgSBMrSlKlxsCw1OwyaI="; }; - cargoHash = "sha256-bqJ9beO+AZlz9GZkO5cAk45B4bxyfYq+pLMFWj8pWwg="; + # Working around a bug in cargo that appears with cargo-auditable, see + # https://github.com/rust-secure-code/cargo-auditable/issues/124. + postPatch = '' + substituteInPlace crates/arti/Cargo.toml \ + --replace-fail '"tor-rpcbase"' '"dep:tor-rpcbase"' + ''; + + cargoHash = "sha256-OJgrIXL185W9rcQd7XZsgiqN4in74Oc2jDT1ZmcCC6E="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; @@ -68,7 +75,7 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; passthru = { - inherit (nixosTests) tor; + tests = { inherit (nixosTests) tor; }; updateScript = nix-update-script { extraArgs = [ "--version-regex=^arti-v(.*)$" ]; }; }; From e313d248e1435b5b010bb10723f143bb887485f8 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 00:55:44 +0700 Subject: [PATCH 0173/1079] python3Packages.scipy-stubs: fix build by updating uv_build pin pattern --- pkgs/development/python-modules/scipy-stubs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix index 9ca5818092a0..8235e21a802c 100644 --- a/pkgs/development/python-modules/scipy-stubs/default.nix +++ b/pkgs/development/python-modules/scipy-stubs/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "uv_build>=0.9.0,<0.10.0" "uv_build" + --replace-fail "uv_build>=0.9.25,<0.10.0" "uv_build" ''; build-system = [ From 110a4049ef2d58dd23c668b173f0f0839aec8eec Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 01:45:40 +0700 Subject: [PATCH 0174/1079] python3Packages.sourmash: fix build by using system rocksdb --- pkgs/development/python-modules/sourmash/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index 4f3b9eb669f1..f0fb2c10bb3b 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, stdenv, rustPlatform, + rocksdb_9_10, bitstring, cachetools, cffi, @@ -18,6 +19,9 @@ pyyaml, pytestCheckHook, }: +let + rocksdb = rocksdb_9_10; +in buildPythonPackage rec { pname = "sourmash"; version = "4.9.4"; @@ -41,6 +45,11 @@ buildPythonPackage rec { buildInputs = [ iconv ]; + env = { + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + }; + propagatedBuildInputs = [ bitstring cachetools From a2c95b29b6c3428f6d494d63a6fa20da06ebf84a Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 01:46:18 +0700 Subject: [PATCH 0175/1079] python3Packages.sourmash: skip incompatible tests on py3.14 and aarch64-darwin --- pkgs/development/python-modules/sourmash/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/sourmash/default.nix b/pkgs/development/python-modules/sourmash/default.nix index f0fb2c10bb3b..e046eff43734 100644 --- a/pkgs/development/python-modules/sourmash/default.nix +++ b/pkgs/development/python-modules/sourmash/default.nix @@ -2,6 +2,7 @@ lib, fetchPypi, buildPythonPackage, + pythonAtLeast, stdenv, rustPlatform, rocksdb_9_10, @@ -74,6 +75,16 @@ buildPythonPackage rec { "test_compare_no_such_file" "test_do_sourmash_index_multiscaled_rescale_fail" "test_metagenome_kreport_out_fail" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # argparse subparser usage prefix changed in 3.14 + "test_cmd_3" + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ + # rocksdb segfaults pytest workers + "rocksdb" + "disk_revindex" + "create_dataset_picklist" ]; meta = { From 31ab3029dd9e3150b01d30d612b05bb32407cb99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 May 2026 19:48:35 +0000 Subject: [PATCH 0176/1079] pawn-appetit: 0.11.0 -> 0.12.0 --- pkgs/by-name/pa/pawn-appetit/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pa/pawn-appetit/package.nix b/pkgs/by-name/pa/pawn-appetit/package.nix index 6152bb4502fe..50dd83f55a9f 100644 --- a/pkgs/by-name/pa/pawn-appetit/package.nix +++ b/pkgs/by-name/pa/pawn-appetit/package.nix @@ -27,13 +27,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "pawn-appetit"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Pawn-Appetit"; repo = "pawn-appetit"; tag = "v${finalAttrs.version}"; - hash = "sha256-WJ/tFOizESDqdLy4maMKUZ79mgyyxqLuwCxWZ0+NVX4="; + hash = "sha256-9D8zeo62+xb5EsVQ39nPcwCx1w/47oY0NNFQyrSpFGQ="; }; pnpmDeps = fetchPnpmDeps { @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ; inherit pnpm; fetcherVersion = 3; - hash = "sha256-amXrz/ZzvjvNYlqxzTtQXiZw/NnUVJ7PhqG8oHsEe88="; + hash = "sha256-c4ckvmzosWrB5eXG/xpOH8mYgNNMgqBZ9q8yU7Pjve4="; }; postPatch = '' @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoRoot = "src-tauri"; - cargoHash = "sha256-UKaW+NiNA398nyGs9+SjY+tUvLjCPrSxX6bZLSl7/EQ="; + cargoHash = "sha256-bglNpRsHUZoHE7/KGAc9UHWI6Dtg7foA7/8NZ7qtfqw="; buildAndTestSubdir = finalAttrs.cargoRoot; From 4b835e1ec3c1b2f5f665dbfd1262a247141e57cb Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 9 May 2026 22:14:25 +0200 Subject: [PATCH 0177/1079] pgformatter: 5.9 -> 5.10 Changelog: https://github.com/darold/pgFormatter/releases/tag/v5.10 Diff: https://github.com/darold/pgFormatter/compare/v5.9...v5.10 --- pkgs/by-name/pg/pgformatter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index e8f2e449bcfe..ffce37761ff8 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -8,13 +8,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.9"; + version = "5.10"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; tag = "v${version}"; - hash = "sha256-G4Bbg8tNlwV8VCVKCamhlQ/pGf8hWCkABm6f8i5doos="; + hash = "sha256-OWw47okAs8x4Ri8+IJHPhy6YSkSN2sBlJ0v8h6GlhfU="; }; outputs = [ "out" ]; From 6542dad56758616566be463eecef02bd4949591a Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 9 May 2026 22:16:55 +0200 Subject: [PATCH 0178/1079] pgformatter: use compound license --- pkgs/by-name/pg/pgformatter/package.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index ffce37761ff8..3833cf85004f 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -54,10 +54,12 @@ perlPackages.buildPerlPackage rec { thunze mfairley ]; - license = [ - lib.licenses.postgresql - lib.licenses.artistic2 - ]; + license = + with lib.licenses; + AND [ + postgresql + artistic2 + ]; mainProgram = "pg_format"; }; } From e2d94963a40b6c99fe92d1495f61dcacf6015d1e Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 9 May 2026 22:19:07 +0200 Subject: [PATCH 0179/1079] pgformatter: enable `strictDeps` and `__structuredAttrs` --- pkgs/by-name/pg/pgformatter/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 3833cf85004f..142acea85995 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -17,6 +17,9 @@ perlPackages.buildPerlPackage rec { hash = "sha256-OWw47okAs8x4Ri8+IJHPhy6YSkSN2sBlJ0v8h6GlhfU="; }; + strictDeps = true; + __structuredAttrs = true; + outputs = [ "out" ]; makeMakerFlags = [ "INSTALLDIRS=vendor" ]; From 3aadd2474373d079e1cc6c1d798c9254d63edab3 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 9 May 2026 22:49:37 +0200 Subject: [PATCH 0180/1079] neofetch: improve throw message See discussion in #495887 and #501520. Co-authored-by: Yiyu Zhou Co-authored-by: NullCube --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 403b2b4aa6ed..e10bfcb172a0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1471,7 +1471,7 @@ mapAliases { nekoray = lib.warnOnInstantiate "nekoray has been renamed to throne" throne; # Added 2025-11-10 neo4j-desktop = throw "neo4j-desktop has been removed as it was out-of-date"; # Added 2025-11-01 neocities-cli = throw "'neocities-cli' has been renamed to/replaced by 'neocities'"; # Converted to throw 2025-10-27 - neofetch = throw "'neofetch' has been removed because it is unmaintained upstream. Consider using 'fastfetch' instead."; # Added 2026-03-02 + neofetch = throw "'neofetch' has been removed because it was unmaintained upstream. Consider using the updated fork 'neowofetch' provided by the 'hyfetch' package or the alternative 'fastfetch' instead."; # Added 2026-03-02 netbox_4_1 = throw "netbox 4.1 series has been removed as it was EOL"; # Added 2025-10-14 netbsdCross = throw "'netbsdCross' has been renamed to/replaced by 'netbsd'"; # Converted to throw 2025-10-27 netsurf.browser = throw "'netsurf.browser' has been renamed to/replaced by 'netsurf-browser'"; # Converted to throw 2025-10-27 From bf30317baf551c4d6cb31bb92a3961ff368e7ae1 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 9 May 2026 22:52:10 +0200 Subject: [PATCH 0181/1079] neofetch: add release note for removal See discussion in #495887. --- doc/release-notes/rl-2605.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 5953d676210c..a585781131d8 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -288,6 +288,8 @@ - `spacefm` was removed because it appeared to be unmaintained upstream. +- `neofetch` has been removed because it was unmaintained upstream. Consider using the updated fork `neowofetch` provided by the `hyfetch` package or the alternative `fastfetch` instead. + - `vimPlugins.nvim-treesitter` has been updated to `main` branch, which is a full and incompatible rewrite. If you can't or don't want to update, you should use `vimPlugins.nvim-treesitter-legacy`. - `services.taskchampion-sync-server` module have been added an option `services.taskchampion-sync-server.dynamicUser` to use systemd's DynamicUser feature. This is enabled by default when stateVersion is at least 26.05, and disabled otherwise. If you need this feature, you need to set `services.taskchampion-sync-server.dynamicUser` to `true` and migrate `/var/lib/taskchampion-sync-server` to `/var/lib/private/taskchampion-sync-server`. From a8b04525998391b38fdd0ad621c3967e52dc0cc9 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 8 May 2026 15:05:13 -0300 Subject: [PATCH 0182/1079] dotnet: reduce update time The update bot is currently failing to update dotnet due to fetch-deps 30m. - add a --vmr-bootstrap flag to binary/update.sh This allows us to skip a bunch of packages and platforms that aren't needed for bootstrapping the VMR. We also add the IL[D]Asm packages that were previously in deps.json for versions 9+. - disable fetch-deps in versions 9+. --- .../compilers/dotnet/10.0/bootstrap-sdk.nix | 431 ++----------- .../compilers/dotnet/10.0/deps.json | 51 +- .../compilers/dotnet/11.0/bootstrap-sdk.nix | 431 ++----------- .../compilers/dotnet/8.0/bootstrap-sdk.nix | 571 ------------------ .../compilers/dotnet/8.0/deps.json | 54 -- .../compilers/dotnet/9.0/bootstrap-sdk.nix | 371 ++---------- .../compilers/dotnet/9.0/deps.json | 51 +- .../compilers/dotnet/binary/update.sh | 174 +++--- .../compilers/dotnet/source/stage0.nix | 9 +- .../compilers/dotnet/source/update.sh | 25 +- 10 files changed, 247 insertions(+), 1921 deletions(-) diff --git a/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix index 7b013ed2a62c..abe039f3df55 100644 --- a/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/10.0/bootstrap-sdk.nix @@ -9,31 +9,6 @@ let commonPackages = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Ref"; - version = "10.0.5"; - hash = "sha512-Ktpg7S9q0hqEU61eFrv9MD9Tjlh1dzp2SgoDjr7JaiBOaNQOLtyYVAceV9ezAcJ4psLKsTKO81oX+Iuf4RhIEQ=="; - }) - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Internal.Assets"; - version = "10.0.5"; - hash = "sha512-EVPO8CrM8wNIL1LpwgDzAzgAd/9GbyA6PiphaH678yedlzzMLZ5u5CINri9JAbJ3iW7QiTzOclPXhu0TWnQGlA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-LAqUC8iR3isE1E/FjWZ3ro1MyMXl3EnjkxlyNDr92fOxlcnnA4G5tdy67Vet3EuXIAtVNR2KPfCmykB7bEJgHA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Ref"; - version = "10.0.5"; - hash = "sha512-vO3fy0Y/qnWjyZbWNWh+ccnwHhlwhm7Hz/HgN/YnkU03zWgqXHLzu2FSzvmkgk6RAsbzw8Nm+Co1FRA4dz+Fkg=="; - }) - (fetchNupkg { - pname = "Microsoft.DotNet.ILCompiler"; - version = "10.0.5"; - hash = "sha512-Y6R0+8pMvCi7vq0R9RFtU6vj+gE6hFfAzXNMWKULFFHUlqbbVWhj3QBoQCOe5/4bQChk0QWg8k7i/pAxyj1WiA=="; - }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "10.0.5"; @@ -42,19 +17,22 @@ let ]; hostPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "10.0.5"; - hash = "sha512-D7Hz+xRec/A2VH9rwqrPxIM/YlHwbfDZV0Eikloh4eJl5LytP2EBCQjg+PWFmQnDoh4NxRFE5HKbtTaU9pqVkA=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "10.0.5"; hash = "sha512-pUikpkbJmTObQh5v7CrIGshp2kW+qYrxUVDML5pirTLPga3LI8PFp/IGaApvM2vO9nCj4QXwLCEm3WDi/aXNYg=="; }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; + version = "10.0.5"; + hash = "sha512-lwuqcJBXzERKfQsvyazrysr8w/sTXMX4yEWHQpxVbYbbJ0Q3NYZuBFF5b8Kj95CotZ7tROihtaj6NSU5H0Fl/g=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; + version = "10.0.5"; + hash = "sha512-xrlbKJinxm8YW7jJztS4jsWA67o82rK+sw0/3kB6LGBO0OfTWAAyn2wiM9nNGc7mwatWlaJsz1VpRnsFXPzhXQ=="; + }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "10.0.5"; @@ -67,49 +45,38 @@ let version = "10.0.5"; hash = "sha512-NM7MFm5+nQ/sic0P2iGXgxwDj/bGZ2r3cjK+Ax2vvvQNHIJl5knw8y5r9lFSYpIwE4gA1FN66W5Yb8rQopHoyA=="; }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; + version = "10.0.5"; + hash = "sha512-mLRe66IRBIpPbQupO82l/PWn5ZPPdQf3DcN+cSgpP58cgCyEpFj3Q7jCRRS3f7tLe9jc8B50yrybb3ztBJ8kpA=="; + }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; + version = "10.0.5"; + hash = "sha512-4uwzf2oSww5VcpDeI66ie4uRAB/CVJtuvWjbSunQp7tSxJcPIl7OnCY+TljJak8yFpJcFW4BiMlUGMIKBpKKjg=="; + }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "10.0.5"; hash = "sha512-Gi+ZdJq9xBsllyMv9TJAVtlMXeMpAWf3ArxJ49RJ2bpSW1lKc1nWEVQ3xI53MgGQTSi2D8fk/+mFP++jvBxD9w=="; }) ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "10.0.5"; - hash = "sha512-cobJfKOo+3sLAO6DRwHUuwDVfbDYiXXtoR/lKyGbSfmWSLY1qfGzJTVBuNp/+Rtncn/OBJ6jQ1fAP9Sul1OH9Q=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "10.0.5"; - hash = "sha512-qplAXaAnkLbVwaSI3zQB9YTfxrwv6xK4Ti3NPR0Hpywjqe1UhjHrefz4bJRVgh9QcNqLxdgH4ja6pMlvF2G10g=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.5"; - hash = "sha512-+4RIyAnPeoRDC1pxfS1fqlq5I8KRQgUc2hgLrNqbPmyO4M6QB3+e9u39fOZi/Hg/FHYx5TTVbB0GrhiCbMr+GQ=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "10.0.5"; - hash = "sha512-kNH0Wr161xmHhtwvu6hLn7ReMHHF/rr6orocFeAj7tXP1Mt3Hjpydl4ieTNXd+Q6QD2ufs14kQOcmXrWA6XCTg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.5"; - hash = "sha512-X8JiYyQFwRvpM63TI+szjk/2EVjkdn3QaxlDld7WrTB2EL/e6YPU5Vmot3Pjg4U/ORBi1bnygoAJIZWDBd1W/g=="; - }) - ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "10.0.5"; hash = "sha512-GPptAxSiLpFiXblT0g+ourLNofK6j30a3KjIt74OiFklg9Tr5M2MKhV8KfzJ7kqeG8jgviYuHy+2yZ1+8QchGA=="; }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; + version = "10.0.5"; + hash = "sha512-nhqDpYsJ0ZtIzmCz14yZxLGb3NWqi6+UUOvX8oWK4TppwB6k+BUSbxJqizxnZiPOdvEtDGgUg82Mjy85oDKZww=="; + }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; + version = "10.0.5"; + hash = "sha512-gvHj4jcm27QN4VdA88D5LesFQduNQhmOteIsxpmmT6RZSnvgGV5nm7QEAsAD8hcfLMJanC4LPT8wkSsXahSYrQ=="; + }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "10.0.5"; @@ -122,99 +89,36 @@ let version = "10.0.5"; hash = "sha512-zTRKBdj7hhJJJyXrlkcMiE+5rF/0JkiADnxVP2MRLyUvj4d0COAIsczwQgO3RxyYtsAgOiwwLscOWmb8A5pvvw=="; }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; + version = "10.0.5"; + hash = "sha512-CZRQIfY04HIsdEFKvgAvjv4yV9X/odFOhgAl7cEBFAdZAfvdnnpZpXEPGxBmQsA9lNvwDr610O0vVeDO4AKfUQ=="; + }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; + version = "10.0.5"; + hash = "sha512-wistTWcuIbhOz4BI3tYLnkY5w6IjJkk1QCbHzQHHX0o15qvsmMT1eb25CM81ZJRAwMSxPjhZLshPdTdhHPHARA=="; + }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "10.0.5"; hash = "sha512-ZajiQZT7q2tQtOM18Lk8SWVoCcYLKg0YXDybHpIast0mqM4DXXvNXDeTOERufdioEoxy5s6STiOy7BPN7XnX6A=="; }) ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "10.0.5"; - hash = "sha512-mkjk4oeHj7mutqsszAWhxtFRwwjXFr1uI5JopdN31Y1v/rxFwfwzjftsnlEwNcMtxWftooVZK9+uBQ66iWE7Kw=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "10.0.5"; - hash = "sha512-1bwi83hLpxKRElgr80UES+FV8uhIVX0T14hOSukAy6cgjxPVmkPvllcL2wcVL862IZ8mNvMubFMyIHI9X5tzKg=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "10.0.5"; - hash = "sha512-AEDznHbzYo0x/j4NJmGN2+9iaVC4G+f/O7MZWJfgS1ghSlQ1nE78/9n/CaKRaLV0kJszOrHSVtVT+WpXygQBJw=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "10.0.5"; - hash = "sha512-LVHy/0yiKtncb1QOk3ixTfpT7HyLqX0ahpybFSbr/E7D8jJOijQ3eFNHpyzO9IQ6yKpA1/f1maFy7xg9hMPxJQ=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "10.0.5"; - hash = "sha512-rsn1PvaakbpQfUOtyLodRcJuUyyn1I6ubGmt2Lfn6yVdLi761gEUqy+uPbyqw7UUBOVZHn4RPhspAXjIufixlQ=="; - }) - ]; }; targetPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "10.0.5"; - hash = "sha512-+ilMva1bCAUMrOpPRiNfzSewq/Tp1JkrdioTJDxqpzsfBuOizDynqr0tBbckZnWiygo/tKjZWP8uoZNAscroZQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "10.0.5"; - hash = "sha512-ov3HneAvNdMPK9ALqRKEu13VADbbZ6D+jdRHqkx2pGAu6RvueNGLLbiufNTlTSLkXsZMI6XlU26aqycPG2zXdw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "10.0.5"; - hash = "sha512-JkHJiR7vL6mUtdIZz2YXIQtWqabjdgHaFxyt5jQWOJHCvc3RFAsOVSMMsAC8l+npjkjipTy1JDidbiygJtFGYw=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-qRze/kRX3MyRvmudB+SkxSdisBYtYCI/0s6uCq15j8MC5ls1slhDOQohBhpGqokJvO9p1/BkRyogAejmpveAmw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm"; - version = "10.0.5"; - hash = "sha512-GqlBlcnxxNX14NUTl13Hc/AewEadOuaWRpmQURs3zfvWjqMXkE1yDOxA/1j0KnFfJEjFXqYiAn8Q52gIYq1Wag=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "10.0.5"; hash = "sha512-Kp+MsuKVXftYrRfCCSG1iX0Bx9PXtE6dkKof5WwgW4OKwEmQrZR1u/shk0pXlTt/j18sALS2HaZd0sHuHjVfXQ=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "10.0.5"; - hash = "sha512-qt1Ap/tRTi6CavFtXJmBnzHpIBv+MXi8x2SZuNdolC5f9PJ91Knd3cRMl0doebNFo3USyWeSEMuox8opiVtdSQ=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "10.0.5"; hash = "sha512-7/upjkbj/5xKViNzlVkYPq0hIwCnjApGmxRCLWdW3HBXdwVUrVsvNtvXJW1L58HlIK9/AaErmZMrjjhfbZMUlA=="; }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-ucjmiECPTHBzvBe6H2fmsY6Ensjj7Ke5NUlOxFebQWhkdwS60zPOcMnSrns7qSJffL6jp9X0FOHWYUeImBc9dQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64"; - version = "10.0.5"; - hash = "sha512-Z5+MK4jKA1mNwXAvtI0UTg67vop5LoHRtNgKtQLZkjk+ge+F36ybFQOOhcwBu2Yso5b0rn9V9H5DI0n8osNp3Q=="; - }) ]; linux-x64 = [ (fetchNupkg { @@ -222,107 +126,11 @@ let version = "10.0.5"; hash = "sha512-S/cZ4FGOWCCdkeV7itqKS5j7kui8GDnJW16yAWCT6QRRkbXF0yP7NE18hdnEydZaQT8NjECxRjp3mkwl/xkawQ=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "10.0.5"; - hash = "sha512-zL01730sNpJABOrMaIYjZvX1dYGB7FnIHHbFBuxUoRxxCKCxO/g+Xc3OHq5omR0R1Tj9VFrYZckPxSAh7tM3JA=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "10.0.5"; hash = "sha512-geyVni1xsr4NPqWB1ygit+ewOhJv3cHoh2PKT1dP+6AlBkeALZZnAhyrSuG0CHgIE8+mpFSv/CxQoWPWqFDZ/Q=="; }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-7GDrN+V3+go78AbI8EGZRbI4d1/446XUDrPs1fo8bXOUKmW3MhpVty5Yur/rShI+g0AaGtsOsETawLRKfrUxmA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64"; - version = "10.0.5"; - hash = "sha512-767sIOnHoYvcik6wLCvJg/aemlmHSqDQRaCghd36Go9QYJMuXcYtdGEk6m4mRVM3pEirS5/kVqZWtWhDdL5RpA=="; - }) - ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "10.0.5"; - hash = "sha512-DkRALJnKSi/+0zTBkQfLVZP8FR7Hb33CwS+upyYxq/Dpdi2oBjnr0pbJLdINR83j530P47VgUKwKr+l74ED51A=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "10.0.5"; - hash = "sha512-SonDz+TLIIBe6rVjdzfKR7SyqvOn84ZAwrSLDWX2miRSwMN3iIYAHL1nkKii5aJhqUM0xbl69zRxEp0cbqkPbw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "10.0.5"; - hash = "sha512-g0ETxPNUff6SxCXrjUlzj9zy2nPpmgzbkEwayQngZTGR/zpgL5jLI1Q6e/GGGMCrpFc+SWIO1hxpqui1H4TARA=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-I4riXKiTE1O7a/H4aCTmIFRE4LlmMLwzyAo8HwbZUdqYNtFhqm7ByTJ3nHi8BTG5CPaE6BNJ27/MPNqN+sJ30w=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm"; - version = "10.0.5"; - hash = "sha512-yXSmkwzv6MdUniaBk7+lj/oV0Q5CoGiX6HF4ZxlUxaCTcLkg7XI+kRfBjD9ZYZHv8qChc/nkU9zJaZkpbQuOdw=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "10.0.5"; - hash = "sha512-IZTJ4sSam7VntRBhvpCjJoCDnb6F/uLy2wpdOTyrenwYxfdBYQPIPLJeAemH9wYuIAv1/ljd9N9HR3K/l8hT5Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "10.0.5"; - hash = "sha512-8JZThCg9zOAu9PEJ/ETfAmGqL2sY88KNBp3MTZrjfQhYHGN+uTnqfUA7TpJtiTYFSrmY3kYJ5KBzv0jj/cNBHg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "10.0.5"; - hash = "sha512-YLR/sCAc99a+zAWZEvP5NzdOg48vifHRdEx8PKIx9AG7upx7NUnp7Wi2HAfC9jzAMziP4Nsmk3qdAPKh3l2gyg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-f0/gO5PzVXMrqeRATua6zobitnZ+iUE+JxYSw3P0BDgDFPt3+uWI/eULbLjTosr3nJdLF1Td9sNGYxpi54ivpA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64"; - version = "10.0.5"; - hash = "sha512-3gLTjeteK89N5/onUYJm1KPt+xoTf37ZTJwJ+G9dv709v1zLDpZEUtG+puLOIZzCFpzqnBj+2+JDdYrX0skmkw=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "10.0.5"; - hash = "sha512-ao2tW5jlik4441BgZSpspSbcJneWxQhu/3eGL91EjY7JsQsOT5ga59ULSBWo9X6VuqeHQN8dVMkvNbRzMha7cw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "10.0.5"; - hash = "sha512-+McjW48YCQx/uNHsyMjowcG0cFg/fv+P9wAQ3ra3cwjbkkSbuAQcfEDiF98mwfPOdcF5xFVSiUJKErnOX4YScw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "10.0.5"; - hash = "sha512-dvIY+3OjpqPeYN7nUzmCE0AcOAuzAFzH6/XnRq6MeqEHjFaTAU0uapdxn+qDOvAvspF37mdIUVuNFrlTGkCC6A=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-RoiIBfpNaQReuCqRqzJ0pe06udmDpf5mgKRDdXilw19ZXhz1rs6apVKbaMQAPUDwdxQoiuxhFIA1EQSZCfImsA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64"; - version = "10.0.5"; - hash = "sha512-z/tKLcDLBPdTiyq9LiHb2OcvxhizFcN2lOdkmMdOP1Eh1BQ06ws+8yzdtQGSzDzmvo1uGES+7Dor4qDtMcUYiw=="; - }) ]; osx-arm64 = [ (fetchNupkg { @@ -330,26 +138,11 @@ let version = "10.0.5"; hash = "sha512-E49zQ382W6Tdx+kTqxwS/6AaWXhOn1ToqArv6Q52HQLEPzouYvXKZWgw5cPIUnqk2lDO1xLnWJ3WgLt5t3XxVQ=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "10.0.5"; - hash = "sha512-tF2X+/u+NZTLFMNA3yhZhbUr/w5dc6J/6ARfV/MDcaiNWawD1XmK/lpNlOPaLJYdSPpzL0cELZ+MdD/bGiL72A=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "10.0.5"; hash = "sha512-gSNu28XZcmjXfcbd1k1/05Yt1705LtruRRvU8ISXYaSHDhBkE2b1ylBZEV26OfnJFdxfF30lGXFoVzk1UqvYpg=="; }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-6mVo20DumP+FsdR53lOJvDBFYc5707rwqU925HHEsxYhsNk8v/BfRRGynmCINpoCElBZ7YinP+nhCGdWSf31Sg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64"; - version = "10.0.5"; - hash = "sha512-kN11Hky8RX71JccTcYPDXa9FHW0P2MPpZYyeWb0xZcYQX8l+9g6VdOZ1s40g1izuYUWR1LYCcaZkClix8QvPcg=="; - }) ]; osx-x64 = [ (fetchNupkg { @@ -357,107 +150,11 @@ let version = "10.0.5"; hash = "sha512-vL/Xgnw66cgdg2cwwttTEJ5BaHokLhjjW/q/eWQfkGwNF8DchzR4PFoMKd+o3Zk+6I5AZneWn1mGYLpo39JS+Q=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "10.0.5"; - hash = "sha512-aKH4tQCrzWnVntcprnrsQVLpLMrn2gJXSLqRT2AH9+9kCq7qdelzev1JY+O3Fb+/dp+/v9mVOXde9GHu8G2uaw=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "10.0.5"; hash = "sha512-Pty0O+hUt8GO3kB3XY3lGic5EKgbMgzY/n8XvkBsaVspJ9VeTvlvbhffZ81vMDfARdeQ4uYXzd5a14NSEfdNhQ=="; }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-U/Xph2FJHj79dHtyOWI4+pp2ZGgD4v9Ky+hOQyRmgN42x+uYUe3ylyW5hVQoVH83SjtrZvW0OHJ7TU9dcAZRfA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64"; - version = "10.0.5"; - hash = "sha512-+j/ZvkuvYbsipm16qIMyyEoYU9bN1ocGk0Bb9VMFA2nm+u7i6uNCZHgbKirpDeXiw+jLwTagv0542P0++ZqQUw=="; - }) - ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "10.0.5"; - hash = "sha512-XBGMqFcb278bleC2+uieyUHFYAYdCwDlqPKa2JpiLrSdbFwbTD0jd/bACFCfeJj23gPWS0hUrFP9U6sexov1hA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "10.0.5"; - hash = "sha512-R6wUWrRt8Q01feMFx+rooVC3QgJzoPrqnHkpFOVyFP8vbtJJc0QFADpyGolcTQHdaS1qocx+tOE2O85rxSzfBg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "10.0.5"; - hash = "sha512-V9BNBzKC9tb37jjsdkPE3XrLa+9hVIzSy1QQqD79/ZXNbC481DKzJzbSEWqZtlH/jn+oxLTVioo1cyNcMtE5lg=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-CMdJ1KpI63ld8rfiiYqB7JPEi1RZ6qRqv0xip5OsieJ1IQGKbje5mdxrVqqLiIveUGsdf99Y0rJMEv7vQwFLDA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64"; - version = "10.0.5"; - hash = "sha512-SF1sLHKC/+acZAZzLf6KEHnc35UToczWBIUTJTkG6YgAIxrtkDZ87UuhuJ88nG3SXzUu10oM3iJ2n5BcBAB+8w=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "10.0.5"; - hash = "sha512-IHCUjslASrwPeYCuVEqNtLfuhIEgvPH0XhfigHyHsmUeV7o6UBKE4XmINjufE2tsgXUnlRG4yHZVgahqFVYQ0Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "10.0.5"; - hash = "sha512-ts+lw10c/3rqMgwwIEq7KKJ1elP4GL4I6h/vZ6L/gdBZTneCqUU/1yiDpKmGWWPc3sRgM/jh+juYibH3ZxrwOg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "10.0.5"; - hash = "sha512-GZ8vwTCPtxnQifh60odRfe0aq9+6RkTYkqXa0JxVI4t2HxPDO3JDkwLlUKZdiFgfDRQ4rkux01Pui3rO1kmpLA=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-yAa6A28bU0SgTVjKvEHI254vgaRbQOX5zwyqelczF4Up95wnUdbo+dlgVKcDqaQtnGdV3A+FI2lCANj5IPyP8A=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64"; - version = "10.0.5"; - hash = "sha512-KNQZFfnPusZJz9KKGQ0MYujNI3OvPr4Ce9l73T3jCXbh7y80y/JFimg+0Whrz/mHBLWOpLt7/1cVJw5psV8rNg=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "10.0.5"; - hash = "sha512-vYxGmc8gORpENpwj3x5KX799nmztgPAeoCUJIjgffzh//2cSeNxnKSBlDF/UHEMWIxzS+KvIySa3xe/0UWT6tQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "10.0.5"; - hash = "sha512-56DjoIPiUrCz+KNihIcywDJooPmHzFYpEPgWaZVb6p30OOs1KFNnoQhD9Yy4BqeMR0YrIuf1otKKpb5oeJ20nQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "10.0.5"; - hash = "sha512-keZXRiTa8DMzEyk5r72fy+KcARATMLx9SjdG8tPt1spm5q53E51r70JgTYUWmy/EArb6agEAWcriBdGH4nhcyA=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "10.0.5"; - hash = "sha512-mq3Dk48HNnAlEfVTFpne0lP94hgJrQCYTSxOwWolaS+yc6oMXzCmJ00tBaMn4gH+I5AwBrRhCJu90tRGFw8L8Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86"; - version = "10.0.5"; - hash = "sha512-uYEXkEpI1YGxnwPAvefr8htm+bsGOZhA+1Lqgr6jecFcsV79tPHNa/RGZtWBi3Jca272oojjqnXIc3ai4QQKRg=="; - }) ]; }; @@ -468,10 +165,6 @@ rec { aspnetcore_10_0 = buildAspNetCore { version = "10.0.5"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-arm.tar.gz"; - hash = "sha512-GuziriIhK5fpgTan7noU2WkAGceJ8U4LgReFY5B9FSHwlxvITa4we4KWJv9n16tm3+sSAP+EiJnXykBQ/IRUHA=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-arm64.tar.gz"; hash = "sha512-bKs7gZELo+bhGFlaRZSDMfXRUGtCrwlC956j22Yj6CBVehdXlzvsua/T1vjq2emmQWZ4YPKn+71Zi8r6OPRznA=="; @@ -480,18 +173,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-x64.tar.gz"; hash = "sha512-cQjs3ajiYH+oDitF8SCdevUwHVNDi2XSJpYFuEFa69SdsjRV2NzXfY/czJBMkgK0g0+couAOJ6UB0gBhdNdsxA=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-musl-arm.tar.gz"; - hash = "sha512-8QYwDJeXiTDL8weEVdh1kU1JtRgRkPCUZWqmbpJBUhUFiJH8JVH+fW7gMaptsLnWhOLw4lHaFf4sg2EUb+98oQ=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-musl-arm64.tar.gz"; - hash = "sha512-mHRGpwP/9xNtrY42UX6BAnkuPlerK5G2mkPoPIRV/D6wZy+3ElLuBZ6OlPlstV4ZcGuJgOPfKgbKzVtwUwV35g=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-linux-musl-x64.tar.gz"; - hash = "sha512-enudhD7jCKrSkqfaGJAfP8oCaV0XoVscuKeFfOEQLrcT+g8VBdTih9sORz0zFkzMas+SdcIx0GsjpUtpvv3T1w=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.5/aspnetcore-runtime-10.0.5-osx-arm64.tar.gz"; hash = "sha512-uGWDyRjReUEAiAhE2hAoQwnQtlcGC5cGixJY319lsQWq42zF+H08z+JAhzro8EUMb/x3MI2OXP0eTLkYelKxDw=="; @@ -506,10 +187,6 @@ rec { runtime_10_0 = buildNetRuntime { version = "10.0.5"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-arm.tar.gz"; - hash = "sha512-Jj8OoRHgcpPzA9RnPuNMGR5Ed0CmBLZ8WzXbx1smC7R7w3SX5IuELL39wpppAMKXZbpna0EHZKwrokGciT+OJg=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-arm64.tar.gz"; hash = "sha512-4jd8PCWQaNhgO6WgF5DexHbd42ELLSXlco733GbqR1BXRuhtMk+lK/yfFW7R4XAziJ95RLdSr66YOova7F6Qeg=="; @@ -518,18 +195,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-x64.tar.gz"; hash = "sha512-knwiavQKvaWYax05TtlL8ACKJ5aN5A7HAr4vo+2HGsarbSa5aLjMrT9IkSaMz4QLvUQBxqeli6rDyHtf6NyVkQ=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-musl-arm.tar.gz"; - hash = "sha512-zHRDvb4j4PD++ndXNkOpzI9rjnGLexaz2KIph/jhF8FmeMCkkVqj+18Iz5DJE6mYLKQ3CqDLYHRAidizC5Fipg=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-musl-arm64.tar.gz"; - hash = "sha512-77by38lmtLmAFobWKvlEJcZ9jzdVfMlCgSIbESrLtgZ9eEENioHrU3qkhPGYta/yjl0KYrfoJqDlU0N6KJC0mg=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-linux-musl-x64.tar.gz"; - hash = "sha512-v4rFy1JPAwwtOCxhi45R0SWlySjFa1A1H8Lau8ijfTVSvXvCZeLay1W/FSiHaVH1K5CSFlKEu9IX+jyJqqHjfQ=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.5/dotnet-runtime-10.0.5-osx-arm64.tar.gz"; hash = "sha512-saRJmrOWdccRiWFctymL5sgJaLbxEehabDflHdc/SYX2gkJcjKX5Zyz5vU0gjZZUxQKb2QH9C/wHKceNRTAQUQ=="; @@ -544,10 +209,6 @@ rec { sdk_10_0_1xx = buildNetSdk { version = "10.0.105"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-arm.tar.gz"; - hash = "sha512-BYl4cX5Opk3MeYSeLngTjUOoowyeq+mxKLxSUf+maPHAFD5tBmOK9zQ/ukm7k8weLgVauJsMJfz20MowNo0oXA=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-arm64.tar.gz"; hash = "sha512-MF3H5/uZ/NiDDTkSKBf/W04EiMz2Mcuc3H16jsHgQFwc93IaWgERVKWpbPzDl1xgzToEjV0OgADbVAWXlP+olw=="; @@ -556,18 +217,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-x64.tar.gz"; hash = "sha512-Kw7RMQbkyFnMueOl8aRQ6EYF69ib2ErDRTswgQ7PpitpV7qqLtBBzC6TL1EhE+FuOuIA/lxLSL5mdndHoG9OQQ=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-musl-arm.tar.gz"; - hash = "sha512-6D2zGInXEQdr4eOol/CAA9T3bE5RyGl1rAFA21jN/34mplF078z+pyc2hXE20CvDOqF1wP4K8pZ7SEUXScetUQ=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-musl-arm64.tar.gz"; - hash = "sha512-EzORZO6Xm5QM66MKrIAzbxVAdNYIIyJBQNAUXYbLvsF/MMtIFQ3fPSVClKJ0ohOivTlLwZdPo1dmHSCaXISdSQ=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-linux-musl-x64.tar.gz"; - hash = "sha512-JUuwDV5oqtO2+4WEcwG8AIq2iex49gE5fBx2JApm6GZI66oq/32za+NVwl78C7LIHCK1hm903zcQDDlYm8XIng=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.105/dotnet-sdk-10.0.105-osx-arm64.tar.gz"; hash = "sha512-kFi8F6r3bQLmamLhJuraDDQwdeQAcx63QVUvF7nMOjPxhUEV2W6TfU45GOnIBdtb8q0wm8RciSIoxOdTSDktYQ=="; diff --git a/pkgs/development/compilers/dotnet/10.0/deps.json b/pkgs/development/compilers/dotnet/10.0/deps.json index 7f588646f196..fe51488c7066 100644 --- a/pkgs/development/compilers/dotnet/10.0/deps.json +++ b/pkgs/development/compilers/dotnet/10.0/deps.json @@ -1,50 +1 @@ -[ - { - "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", - "sha256": "17bcd9cdaee1c8949b22fefe5df4f92daf3faf8846179dfb9cebf26bdb4fcbdd", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.5/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "ae2022aecf016718a1807c83c3c66e03ffe48745ad296ab4ce70e1c37c2860f0", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.5/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "hash": "sha256-mo+oXTx0d1MYBu+EoU82S3Sw6hLpGq8MNDVYpSUlwDc=", - "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.5/runtime.linux-x64.microsoft.netcore.ilasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "hash": "sha256-v/XY6xI4DJV9s8A0iXLPMmFCi4YV1OKPvxNgGZZemG8=", - "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.5/runtime.linux-x64.microsoft.netcore.ildasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", - "sha256": "dbe5d8ed855732380b551131f96c00756e374a59c08883a914eb0bd101710c94", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.5/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "646dfc625d1f6e92a90e31cb31f50e8b8a39c25cd41991fa61f2cf4884ae28a6", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.5/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", - "sha256": "7f2aa235a98b43a1234e0c405f4d94fb06cbaf0db1c7514f567f9ee884ef48ff", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.5/runtime.osx-x64.microsoft.netcore.ilasm.10.0.5.nupkg", - "version": "10.0.5" - }, - { - "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", - "sha256": "49a785da3abe8786f6ceadaf629e27272aa649e07ffdfbb8b46182ac5e48a0cd", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.5/runtime.osx-x64.microsoft.netcore.ildasm.10.0.5.nupkg", - "version": "10.0.5" - } -] +[] diff --git a/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix index 46cdb5d4b0d2..1d9b95bc7c0f 100644 --- a/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/11.0/bootstrap-sdk.nix @@ -9,31 +9,6 @@ let commonPackages = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Ref"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-v9ejIc1iBCwhl8FAuZY/qCVWJBrgWOr6MfLSsYodTFTx2V/X6LKU1Fe24LegPnbpoXqIJmLsBIQrO4KoIxuvSw=="; - }) - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Internal.Assets"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-ecGx9UpGsZkAlNFoZjtDXwuAuh6wCPNz55MLUhmLINpAKyrtIxX5mq6BQETx/P97IeJaEWSWX45OF4+d/YMj2A=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-vm5WP67IC1Np4BKm9Ru+LbzSRhA1bkYy8zrZgvp/UwH3j6ZYrKNqjRt0wO36gNe6h4wWhonU5815ML3pWApN5Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Ref"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-unbntVG3e4LZW6HNkL85AapaCPrvCLdKn7AegdVkIHL+DRaN4uL+Rzu6UyloIx771dnUHqve0E/no8mJ3WHc5A=="; - }) - (fetchNupkg { - pname = "Microsoft.DotNet.ILCompiler"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-H1D3C+gp/xw1yY4K2dSR2r9KPaRYv5QJ2AThbZVcIhkLEYaXMnw288Qzxp+PnLWUyeUXloTiNpKxZKd5XqDohA=="; - }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "11.0.0-preview.3.26207.106"; @@ -42,19 +17,22 @@ let ]; hostPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-qYL5UAYuutTQcgU4mCHmpOrs2kBtNFvcW6TVuLtCbxyiF3bBBF8CEAIdXy60N6pUI3IbCMkXNvXd6g5AeIKwcg=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-vXKuBO0i9nUi9uZbtEl3henxyik4SsWJwjTV5Qwz3W0OcE60wc7vAGiS5mpp/ri8imRoOOwqHv7LOWMwVquCLA=="; }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-a64GvXhuEc4ivI6jI0tgAllXmkhxMUdTZgkfH5VmMpuQqltqYFj/c3HeJp9yeCX0fqO8dRVzeFshWHnEoJk3KA=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-vBJCIWQCfLS2IBJO7fy2OaADC7nG1GF6lUeJVpZQkjFJaT7NsvNBVV9o7h6lSoP5I0jK7Wi/CY0gJ3fF84wEsw=="; + }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "11.0.0-preview.3.26207.106"; @@ -67,49 +45,38 @@ let version = "11.0.0-preview.3.26207.106"; hash = "sha512-6Qh5ssxzcqrDlgI8EDs50xdkMSk8QRNCvGzF4pf2PJKrDRwf/JWJZuVhzD9VnUQYj4FT7k2K5E++zTWfmeqjXg=="; }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-v7xwwXjh9DeLO61O4Zg3kbuz3WOhlWssK0bgJ+nqe87IYNw4ky4aQy7OtO9WlASyMA1FB5kr3FUg5nNrkZVpjQ=="; + }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-S8gEsYiwDhFSFVI+pWt8x7fNYYAuYbnb1jevZRUYYh2oKyJtmDqMJmC6wOoppzEFO7qnkYOOrhpEabbeKJsmZQ=="; + }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-tqmapfWDTNsoVsZD/qFjt9YTnurI2Yk+MRN1O9Imzm50H2xLbcZ+REeozRaetoTJkNjjOqnlnQsBgeFuRLQzpQ=="; }) ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-ufweW8RLeV5oBvsOVIYhhq1fgpf3UHoOj+FYLN/q5MCw1yS7RKQpilpk09Gwqi1yZOPX/0p2DV/RKnIlrtS/Wg=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-K2IH948OGXOKv3gyUAUQWEES1iyu6Mkbxywl26nU+2QH44A+XAKECcRhXnENQz0K7PX1xmSNaMPfJqZPrqRvPw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-kzqFLg9HiUZYTztg9s8wrOuaL28zcwR4n544ym3RgQZBN8co5irQmxfGYYycNLe90tnZMd33dzTHzCS4w+7Jyg=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-92+59M17m2iYairYoxMSlGntU9SsyUIO3OFP6rlMwa7m/CKL0rQ5iolCz4m4WbBAuVtKARhe9bWUZl3FyzJI8w=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-JwTIT49618ShygrCZlFxawfdroMPv5tGrtnml/MFw6570F71Xp9hTtWj4HcGgnSAs0q5FWtaZvvoGxfh0PAniA=="; - }) - ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-6Wx7R8lAJH9+STlTmhvkeyOPTHwtL88boOFzXBWykV0v0yypzdFvdOfjAvf86zSW5mSQMY147yATjckSE3q2gg=="; }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-mL6CWnO7yosgKNrzCOinLs7ty0UUipr1uRqRjk6qjm8X4tpGAedjjUtarEmXWT6Z9WA1DUNt8GpXnqIthJchRA=="; + }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-FfDI3F7L8vT15tzaubmNYc94APhUfDQFfOaKsBuvcgBiyVaM9qdN7shTH1zbW85pTE3m1G0zvVpGC80Z7y7PYg=="; + }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "11.0.0-preview.3.26207.106"; @@ -122,99 +89,36 @@ let version = "11.0.0-preview.3.26207.106"; hash = "sha512-k39ojqAMM5zpLrrM70KhDN5dVMkPuaaNDEQqxD/5BIzx8sXH5q3m9wyxhPAjEqE6gNESSuMNUroxLz7U5e+4AQ=="; }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-OTDRYrIgu1WN6Yy+Jb43gSdNMhUF4dXSkOi8pqUfJFn8MH6lHtJfGYSa0KrE61jWwKKUWdXLAx42Gpne2oonOQ=="; + }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; + version = "11.0.0-preview.3.26207.106"; + hash = "sha512-flnO+/DUeZE9SUmkyIlMsZrvVomX8eshmKUxzYgO+E31TazXiXwvA1J7unq86gQVXlrmoV7xutlFVET56UmMBg=="; + }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-RVOrXi8vm+AB/6Ma3kO3cOTpMxg/B6td8edIeiu96XyrOB43HhoNc4KLJYt3//2Zj92sBip3QZhOB66+XvWMbw=="; }) ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-C7DG8JmkW9Sg4eCCRHRNbvKtjLC/gqG87Rc5/98l/ND1lQUt/zpe3i4W7KkRaF27B9J4Gq/Kp8v42lopE0Kc1A=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-8NpmV5Mi9uazvpb5dgKMDaP4h51oaXQm2/zJ9AQkOLCaHTuIC0QU5aNRv4Zv12yhJ+1tQVXtcr7PEGoa6ftdiw=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-/Jg3oEfmXEY4rRR8EGz5Xu/mU5SZnGzqJe0wPoDCgJbtf3STHRTtBZkB8+DdYss25dkq+yMzCqJDg79beJ3atw=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-+WSonFTv7KjUG/lpJ8yojhJa0vh7Gi9mpg10WXZeQ/olGKe+IJBf45DpUWKQG3XiehUg5ZbQSKW1Mph13EuLVw=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-+Z4QLOIOxxWnel5s9bKr6xzITVVrLOnmCxq19haSZj8gF5VvtuSvoxysD9mj6JWfGLWrYCMWuw/TLtk1ufVmRQ=="; - }) - ]; }; targetPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-9xhdqwdodcbW86pgg1bue/1D+OMkoku+HIaOs+Y2HeEWWUkuvGaVknt1ZPURhNN6LoLGioshBwiLX0FZsBm7tg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-QzRRGW+09aDpSSFtPeDVkSvvZHO8wRV2uDvfwGBXFwAvS7T0srl/iF6yqlGGLm/O00YLexvUbvbo21/I/RvSbg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-tzRhQBoSzqbQvL82tpdy3AOr+szIxCFSVJd8/8MeauJ0x+Ta4KvqG2XAjB2vaT+YZSo8Wr4OZy5eV9dyZ15IIQ=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-S7t/ntT28m9KTteqe5974dSXa9UgZL5FzZnhLa6+HNvEwJi3I026JExPHNsPKMDanXKd4jspZ1EcMFp93sCZ+w=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-fTn7AT8ohQMd7yUvy/LZlGCrGr+wdZlWzn80UYAVnVmwX0CkXNIJ2FivqyTBFVuIJb6H3iIVYsk9pTebmxAb6Q=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-cqn+9UZlNhkzywCde0Qnn64+DvrneOw63CGt2l49gIlPpROoy3XZ4NxpsSAq2coyeFYzYCc4Yt5zym0Sw4MTfA=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-8dRbxg1l7NmevWCg21XjkBaA5iUmwInnKzOS2CUO/SKDRYpncrZt0vPcVDg61KiQJ+jzixrxuEoYm5UadQwIWA=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-FMwUBAikT2x1waTYFb5BmDqM6l+5u3DUkcLcGUeQRXUlp49llUjDPJ7lNgi2RbWoDKlNGk1uaMs4+TfDzCsdJA=="; }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-rztxFHm0e6ZyTVut5NOIDypktJuJmgxi9pXg3FZLCPdQpxyoRGzZAC09jAopN53n8bxfyGt6Fq7uYWlPiSx4GQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-GOfCqW7YBw2quGeJX9iMT2N/rgZqH5iE46DTlie3KCMLYhlu8ZbD4Vx1NAuIc6RG31cyvcwTbo8oXt4OUOqCfg=="; - }) ]; linux-x64 = [ (fetchNupkg { @@ -222,107 +126,11 @@ let version = "11.0.0-preview.3.26207.106"; hash = "sha512-uy0CwGFb9UBJyud3t9DTNTohncZKKxaL0adsA+/sQ1lRt88qv6fZlOfWj3zH+s9H8RlreDQNmnWVp0R7Ooqb1w=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-3P4sEcwTUuEigYuuqjNhEaUrmuPHlivRosmDqi8FcyXUq+IydBBKScEnaYcyA+84paS7088o4hany+tRNb/ThQ=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-1aPEbl8CyJK+JaSKp5aKGXTptfU+4MqLN1cKeXehibb+ujjrOnsaaDbS2z24l8ygCSSbgiWNtc0AtWoKzGl5Tw=="; }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-b1vqxy7kPh3D3nUatLiYFptmTFwokSJp+sqFB1FqNeh6WglDsriuescHjRdLaTY5cpHzPjo04BE4/X7aRARf4Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-fgKQBYlDxpda86MWKOQg93vdwLooITudikNPBMX/638+QTG7kisG7XoKV1PQ5XRTumuSfPiXwYrPJ8XJPqFfbw=="; - }) - ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-Meqyq0cWoi3shkYQ/2zMp7/E+OOxS5xh7RFFUOufOj7RcndaDH4R39fNehsEycG+o7VueXQjTDHX5cuQKo9cwA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-pnwWF6BmcbhLGZ3r9AciEZPHRRqeYA42LQgd6RiEdIAX850b0bPoR/K2L9Z9Cmr5eU++WvFm1h6xDSLyps13pw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-529Vmw1f44/cSFtaSgglHfpk9GsgfMx67M2Pd9V4lp07UohhGLnIbWi93tesF8f3f6DVa83HDHZVcoi+tcrqPw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-v/Vou2NCp4TaHuqcmyHwD6tbS9ZeEB8UNpOGiNashSl+oe30PXELQZAPo0jUyhEEFpQXlPv9mLKw3GFwOeZVVQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-UCaLlw6ZA2+CvbTvpT0M0FVHbOiuetvKknr0po864jG5PrlO2rHT3WzmlN4a98Qf9yl2Gdc5LtuwmDVwcfT9ug=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-HSXS98H8g4asFOGfCIQ9l1v0jMvyn/tVFfMXu+WSkZbImUeIFefdwrwx8yfGDFUwD0HdDyTFZ9Yn5+R/xc1Jfg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-9kjJVJV9nq3uPmGfLhduXZzd7s7mgG2j+p+/Iy6vUeRz9N1Q9S7tcukj/2M+IVEuR2Hkah+9dbZVhNmexKr9eg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-OgsUPS0XMjsEaQCE//fEBx6Z2nUl/jzXxD/fUmqM2tzxp7cuFadbMjYhKSiaHJBDgiWv44mJNZv1mZc1z+fjAw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-FTc3titT6ZCr0H0JcgoGWzWB+xRwdXWkOV+pwNo+K78zIXQFJWCQQfo6LAUfLvDZlqxozxkaM+hDrrQpISALhA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-lfR+ifWtlhM4/SIMEa8bLCyCYAg7vU+fARkRcO7/UgfLhMeSI3XQvwDEL3UxCmaFMQjHx+V8z93fA2wCD51rxg=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-mxKpkfZzMEG5FinMt16xeCtrP9fIgpuUrhabyZIezcllck70tCnJ+no5RMOiGegoa0RS8GlFfktgwbUNGda7gQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-L9Zqe07OOR5e5swhW80GVOVHVOazQzAFMUsQ0OvT1ROoV8GwWxopeLxaduvRIJ8mrrwojr1Qh9R+Wm/L9DNYBQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-8Lf+zLPZA7fdu9qZq58Avr+5Bpwhk4xpK0/IIH0LqXMmuq8yuNlKGdTmzC28kE0aQ28eBUyw+vR3kaUxf+zEmA=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-z2V+omJ4hstb53weBUAQSR927a2xDBTDtzba1vZvMLSOciWju19guP17SS9dFd9chaImfskG2+lb11l9guRs0g=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-ZRzzqGejfhzYjJtelFev47nTRlByX23VkSJEMEEbnjm/GIkfAIaoii7zjFzye3Th61z3RODsLNcSIhz3v4ma/g=="; - }) ]; osx-arm64 = [ (fetchNupkg { @@ -330,26 +138,11 @@ let version = "11.0.0-preview.3.26207.106"; hash = "sha512-hBWzZdGL4XCxxsJ+mL9il/UZeCe1F/p8ifC46u4GpW/r+13LWdxm9DA6Gd9A/gX5IfltOE1CxWZoG8EXP1J5ug=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-COCbrVk2ugW1L+vrn3GEkvbL7mR7yTjQokOfaIuhf07SliM4bt8c4WIL31akDAIKoUPoEiiXcJOLK4iFYdIaDw=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-3UNG8Dpxb3efcwjFkkA4Nll4tYuEsuSG0EV59yVBMWmWDQlqaYvtDHENNCsqpUWtCcRP7ovre5jVQMi0mC9+JQ=="; }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-HjhumZ+SKvzN9TBRyJ+wivZGSz3OEYpQ0D+z99Kir00FJD7Lu+fIzkzN71xipPG0PNeo0PdI/GwPowdHl5qsfA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-31FlRjnxww15d9LbWL9ajqZFHrNZheOGkyt0V0QyzyJeTm/MIKY5p9A1QPbS/mFHYAuP4eilAM5mj5seZGUYFQ=="; - }) ]; osx-x64 = [ (fetchNupkg { @@ -357,107 +150,11 @@ let version = "11.0.0-preview.3.26207.106"; hash = "sha512-yGn04OHjVBBHhbutZdPGYjWIKHV7ezRBKheeeXB0739reyAGH2H0RbGvTN8jgjiUznUku/3os7h5xvq0sxb5Xw=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-oKlkgoPWbrT7ReENkaZfN1PWj7NkDhU1Q9LHXa1O1fQqNZEeqkQ2hidjOlZptV/sE5BhEcAeCjjIl6vzIeLURg=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "11.0.0-preview.3.26207.106"; hash = "sha512-6X+HPPT/dFsr5a98MsB98F2jrN4aGOAHCbGWyvaY7uyGJpoODgozPd0BiRHZqi6fHRn/ykEijsoBss9VDqYIfA=="; }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-a4S3oDY93J73dNmHnEwMl1AcYzlGFvNIJVN+oSzxGhSk4BNUnzY6Dk9tdNr3jDX07nD1xkvlQfW4su/FbY4wxw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-5n4z/cUu4Vn9Zw7EwuL80Rb1SQky6sc5D0jDYO3AtU5dVCGZ1rIJxN77NQBHiJXGv8GYRfIJRoJs2ygUXRHSnw=="; - }) - ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-hwO5tTllyX69qeI+ttGWCIrlE/LgpMz1COGGQ8wWB94G7T/pF9OfL5emLxlDjc2bhiosh9vNTBH9qY15RYIAGw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-JikxGQ5jGAcZZuxnzf6ptRDZaxJatrDFe8jjs8Wk11ZOB2rgpPIWbKgKkbMsZ6ASJhDgNRdaG4bMMKoR1JUodQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-oSSes+mvNzDaym1veBppTyKtZpFyDssRwATN7vdMcRweFw0ubVPJCpo5fnFmqLxG5U54PABrIy9jJUa68blhHw=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-JYLW2MD/llna3yW+KiNO/GglWgNfGxelfDP8JeTA3Uz2Dj5yEWxk3kPRuea+Ud3yGTvOiElYwYtSjvrHLyRLyw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-qbBF9p9k1i1UFBini4zHBOYZc07teaa0pAXhK8aBEg5FbxShR0z43npXyUKYF6YHVfiYQ5S8r4WsWKDusjUm0g=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-wnf58a8gyniOGvNkVqOnzTxJ2Wq4iOqYLtNj3Gy+axG8LCDEGBptPEBixCvTx3cO8klwAvvBCOvPJa7NaGcDNA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-cP2ujIMhlAkvwoJC+iQgBQl3GzXeVfUZjUSwMt9iXqfwPBIg+g7gNSobee0IK7DQcBKitcnWRY4qvHA+MloJUQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-aYNS5Y8Lgs7o5OON76iQOEMsAIE/DC5V6TTT6zziS/SdfoZO+UqIDn2ZKTovwRjjjM9Ruvd7GLXRDnN4D9aJWg=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-Gm2ctdapd4yqa3G6irUQ266+VWJiFIkNxxJO/xYX72QO0fs9w8IEKdwWSUyWFwxMOMv5x06yeSfNaV2jmOF22g=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-G22Wybh3xwG4wgkciWLOXF1V2Qh/hO541/K7biCBopPtWy1HKSlWckyRks1HoDofqYeeaU7wu2n//G0ntewlPA=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-6KI2quzQCrqmb8gCzhKd5+N8E8SUMtp3YQCZVUbYV1MBr+uIuoPsxxJ8cV+uAzXNjYA2naqdQdayMG5qUw8nLw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-KVSNM7gXfb01Fr/bftCHOGCcuGJyWKMHPITAE1qjjRDETp4MkBhitYYX/UXs6bxQKFpc5/nivuqwqa7dcxbENw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-mfuow256kK9eYtZA/Wam7iZxDSK9wwOKs9gAWB+9+oZZLHEsVMmYLfKDRXf7LBpoSi+dtjiMD7LfV39zrtqKNQ=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-Sp78xXJg9HvC7jVd2D0f+B7Lq0JnvJ0vgz6MrdgbLU/mLZP88g6wqIr7aYkRHwc2P5OkUvVtM26lG7AQIPzYGA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86"; - version = "11.0.0-preview.3.26207.106"; - hash = "sha512-bwPLwq/rj4aHjoQjlk66i0UT/amMoQ9y1Ey66gRGzQyHZZZAuaFdPHkzM7JwyfvqPXTQkAMD+cixp0g7gNwo7Q=="; - }) ]; }; @@ -468,10 +165,6 @@ rec { aspnetcore_11_0 = buildAspNetCore { version = "11.0.0-preview.3.26207.106"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-arm.tar.gz"; - hash = "sha512-/sfiVEck3I4F24pFKjd4MidXLw1hHAADOb3U74QgYEVEYCKU+7spyRIze8smqiEW+2pCXvSkoUeey6Nk1pNS/Q=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-arm64.tar.gz"; hash = "sha512-7wbJJQgr5bxq0P7AqzPP5HlfltWuJT35MOfM/6AXZD7cYlwn/C0mGeaU+bv2eOQxq51hQ2KqYW6PwYyORNbDHA=="; @@ -480,18 +173,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-x64.tar.gz"; hash = "sha512-YWlN4Oj3rExdqgOmo+2/mSQana5j2cAhU9kd+d9Fs/2y1UEgMNblL1LCdYLWNq2Ra1T/iadXjecka3c7/XZMBg=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-musl-arm.tar.gz"; - hash = "sha512-2GKewfZCwsZkUIDnG5Tkbb+WyPC4W17/9A7S5DNI2k6Ff+y4HvI2n/4fbeJq6DyQnGJRajvq6tR36hyaQFeVPw=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-musl-arm64.tar.gz"; - hash = "sha512-f9q1IpuptkEKR0a3VNptB1iD92ZRhWQ652OV6KRbPpjTE/TJ7kozVn5PwmadDmAUcSaohyghlYxp/nJCiPq0FQ=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-linux-musl-x64.tar.gz"; - hash = "sha512-uw5RT8FBh4FlTq6eOT4QOFPmZ+s0PjucSKqKkmbLwJX+bLAKxvdSEo8Fm+QlqH0RPI8sxvYPAeu17Bk/GGy3yg=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/11.0.0-preview.3.26207.106/aspnetcore-runtime-11.0.0-preview.3.26207.106-osx-arm64.tar.gz"; hash = "sha512-chpOHW7SSvTiMoiXzFYgbXrri1hL8irvHQrhE44vKpYk1U40uIam2QHTnvylhtbptzA02EZmfjQ7NURXUeDgJA=="; @@ -506,10 +187,6 @@ rec { runtime_11_0 = buildNetRuntime { version = "11.0.0-preview.3.26207.106"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-arm.tar.gz"; - hash = "sha512-pV9APsVEunijRkEVPlmZJYL9IW/vmU9Qy+Mc8KAsfPgov3KujshjzgPfzki95CxGQckSNwBsprQQC7MaAHy+tw=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-arm64.tar.gz"; hash = "sha512-QTXXbJGgJGjO3FnJrHV7C+2x9Yk5F2Aq/d4qJiIaG4KP2q7+92SomqUyAR3Pv3hEc7d0DJK5lF+RJiV8MoSWnQ=="; @@ -518,18 +195,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-x64.tar.gz"; hash = "sha512-Qk3G2hG1tq0phI/qocAV2jRIqAr0q5U4MqjwUifK+LFtbvxPADtnXkfrI3ugXxVEBlUGye433ZnnAfXf1eCfOg=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-musl-arm.tar.gz"; - hash = "sha512-uMBduqLNaeeds7uwC0DaBo8bdx2WBj4VxILCWTy7p3qHT8O0KifAz57wmZQFx3+i+k7auYu1OtHKbeZIxSseFw=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-musl-arm64.tar.gz"; - hash = "sha512-FKB5PUYSxQsrBe0YgPhKsdOu4t7betE7d2OwADfAITsS9H6gGJ5SUpC4EsrXxZ/+bnfctpmMk+E8e9p3FuH27Q=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-linux-musl-x64.tar.gz"; - hash = "sha512-yRDoYBC5t9UwuFtTMlYH4NmqDI1+UCgaTj/m+0hAGuEpWclg9D6/ZVQEhZRva3vdfmkf1041efgO85X9MmKDqg=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/11.0.0-preview.3.26207.106/dotnet-runtime-11.0.0-preview.3.26207.106-osx-arm64.tar.gz"; hash = "sha512-h8DGOlCEbb1uuzXtXlcD0fag7xGEXbe9lAFORo9UcmaAbDQMSE0bagy0VwCdlaK47gR/fbEdqQ8Nz4TygTy+0A=="; @@ -544,10 +209,6 @@ rec { sdk_11_0_1xx = buildNetSdk { version = "11.0.100-preview.3.26207.106"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-arm.tar.gz"; - hash = "sha512-8Wdgso1ktVy/qzAzFouiiB6SjICd/61olH2TJYIC3gG+AIKvLjYB3EyT43qPCZdMSzvJnZTt6I8vnqMySqYtMg=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-arm64.tar.gz"; hash = "sha512-lgL0cIMGlW2QJ39uydsJWDprRnpZWIuo+pWZQODCVZek5YUMP7xcUzvJxh/DxTMJsl5GSNii+ynFDrDfRlO4iA=="; @@ -556,18 +217,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-x64.tar.gz"; hash = "sha512-A6nmiA7NBzAaKuleTr6gDfdYqAhDaDyjo1xGFd8ySTE5/KjDuCCiKF6xVY7HGS39AIFlYIndDSJhOL3GuY5SGg=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-musl-arm.tar.gz"; - hash = "sha512-j3IMukJ+JacaLbx9nRXhpdmCMzhz3N2uhMzGO/v9NZiuoazTcjnegupLe9Xj1vHC8FVPUPQNO8ZwIfjrX8XoFA=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-musl-arm64.tar.gz"; - hash = "sha512-goZIcjbXLoXlP1zF0ZJvL6qV9W05XrQEV1dgeHvAd0KnmThN67odgxp2KoTFTw40TPx4a9ehuvRc6lw16ldveg=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-linux-musl-x64.tar.gz"; - hash = "sha512-cW56k/pBrVnNAw7QWakLaEYxs2vw7OZGRQUV35TKgVmH2Ikl4A6ygbzLl7/3FS5pJgqbgwyROBH0BSzERSxY0g=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/11.0.100-preview.3.26207.106/dotnet-sdk-11.0.100-preview.3.26207.106-osx-arm64.tar.gz"; hash = "sha512-whvgDXbhNV4fiNXn94aBPpe1Yf2MwQQ1b86ic8hVOJ1Ccsjz4n3g8Ne3WVafLHg9QtGUWQ/6lZxGo//4MXRhlw=="; diff --git a/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix index 0ca7135504be..76f364749f16 100644 --- a/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/8.0/bootstrap-sdk.nix @@ -9,41 +9,6 @@ let commonPackages = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Ref"; - version = "8.0.25"; - hash = "sha512-UADgNn3jhsot29Ve5n+8E/J+At888zu38dfKc56TsMIm/Kb0ncgfELgYwSwUGpKI/nASq5XHow1ytueakD6XXg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-QBkofLhL1n2YtYtfsIPGhfH2NIr2su0QXJdaX2hmn8BgxCuKhZyN6vt4pp3rHxudqFT4xJETe3aK8UiqQDsSSA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Ref"; - version = "8.0.25"; - hash = "sha512-fqnJNvz6zQ6c5ZAQoKFKMSDPyNX+7qzn9KUOw+a0PSlMDMBVj0wiXHyuo7aqVq7whII6kd2ZY9rhbhRogeUNVw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-Bzai3fUDV4ffDKwBEBF2IhvOiYbKUKFMnbroIeIMyHs6TFMqeHKLJ3LRy59HZT1FrV85gOnFJ7ye+BD28dvEAQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-d6UrXl6WRQsVr3dvW+pMJs+N/lPeDVOSum8VTkgBdWfFLVPYtKhrpKEJwdM3odmBqpcwjQDtc6Q3/8yz24OsHQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-ZnOPTA2KMqFVZ+0Je41JBUMtj3jbt8jbqpdyWrJ5YvpDH16aAb2bCZ3t9jjBqTDYK8hi3GKevkEouvbbFKzQyg=="; - }) - (fetchNupkg { - pname = "Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-GkqlIMmnibU5KHYtVcYLYc5eERO7Ql5G3xgQYG2dLdTOYBiSwNmWbg2VljJFF7XnoZ4+iWyVekZbkzv/0auQhg=="; - }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.25"; @@ -52,24 +17,12 @@ let ]; hostPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "8.0.25"; - hash = "sha512-yfwiS/eIzv2WVcTwtFvJaucR1r5n4pmQ1ae0SWXAVS6KGVGUHjhRnTyOCivuXcRzjGGZgQH7CRw/2WfSIllFdQ=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.25"; hash = "sha512-0cmoZ6fj2gbWhC1LP5XIpEXwQzlsqWlDFpxjUgwv/pVLe9HPeJWt5Q8Rqui3RO1QNE2CLqrMoWxI85b/apKScQ=="; }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-2906shiCKrL5CSvLaUbFHLr3ZmtRZUfHiAo/EIivDZTJcfliWd27bvGsgVm0R5tSP54E9urxrLota6pOCr9uFg=="; - }) ]; linux-x64 = [ (fetchNupkg { @@ -77,42 +30,6 @@ let version = "8.0.25"; hash = "sha512-BkKYjJoeBKLKfYHhmqIDhJ3tHlQ9wwDAq7NskffCgkaJh4IlCBMCWUDXmr1nNOW8NxaONioD2O0tBZ6KhzQ/5Q=="; }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-nhohobVJGwv4RymT6JtleO1yxFgp0BoSJKqiOHCnybtE0uxIs71mVp13RGsgCvcWDV1EQ9GUD5KHbhW5a6CbdQ=="; - }) - ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "8.0.25"; - hash = "sha512-soxRquFCYg4YJaZ8CL5LWWcjphJTCvj93vl9a9PMNmPjnN6X1ZxX+75LdY+ogrmb14Sw/qogV2HNMJNYZ/wbHw=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "8.0.25"; - hash = "sha512-q/jFyTR3QVUi9rBwcbzv7ocvdZnwBNolcv+7evQtI0MTRvfi6f5R4G9QC1roevAGJEreMMqs+IbPPwI+X5pzVw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-fraXubuYMdH0lR5Qnj79BWnrgYSWUIdZsuR05Q1Gr7w7EHwDU1oTxk1R1cr15d4QECQfm1AY3ZLMSwKHE+GFSg=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "8.0.25"; - hash = "sha512-qNWyQUL5ibXxxewxNX/6XarFtvNIfnrodsAL7F+bRfa9jzoUTlvwclg8e1dyEA4zOeOAcivdFuROJ7bZfQ3kDw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-d2PQ3UJyKeSwu8Oq931+tOKC7stEFsotdEnKbHacd+powcm9gFiNvu4mpUNk1Qha0v9YkEFrAqvjXS/nt3aRqQ=="; - }) ]; osx-arm64 = [ (fetchNupkg { @@ -120,11 +37,6 @@ let version = "8.0.25"; hash = "sha512-rr6lj09G6Mk3P8n93Aa7XGHJ/2XchaKgF8V7QtFgfLWeIUdjNVzq8him26sOQGKtaMXn/hLkFEyweu8carA8Aw=="; }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-DtzolCQpaL3tGzUm5tSEQ8+J7Q2r86zpS1CM6jABeOChIDsDSwfZ8oXvBflybSth7JEnwvnzQWOVov8Jhru6KQ=="; - }) ]; osx-x64 = [ (fetchNupkg { @@ -132,129 +44,21 @@ let version = "8.0.25"; hash = "sha512-k7mqLNAJItPKfPPOnoPI2p6cpjfslWkKk+8KkWSPhsJRMKnR7/8e3f8y5/ToZ0oEfylxyOoGu1SFE62eMzfYDw=="; }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-8FTqcOAKve2+v4d4G3LUK7yU8CmW98Wv2b7YPMD3WH5QthHcnecJiq/y/kiA8vNG09Ir+DauJK4Ai14zY4gDTQ=="; - }) - ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "8.0.25"; - hash = "sha512-rqSJrkkr7OnfqGiqbuCTuBbMwJq4ITzT6dLR+Qz9wEA9dG5B4iI5C5IIPIp+7fO1BkKS+mCtR50sZ2K7sxhEXA=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-HfHw4m9FuU3+f5URxlMDi4T8vDKQkdCFR/BMtsfq+84JTAPINqkVFjwdtC6H+sXlX2hA9jGSUkjrwYm0GXdjGw=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "8.0.25"; - hash = "sha512-bpXPJxE+om30rajR1IA1TNqF4IJi+md70jLMItaQTChivdjJOVugHZDRUJCeIVp4rBglBCSutqH/FLa/xo1Lcg=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "8.0.25"; - hash = "sha512-yiU1skELDDaZcEzHiHBqq4E6pRzuoam3hBLicFx1yROyN++y203yiQDH9nEs0pOMYEZOZQEMqUF5r0lb70b6iQ=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "8.0.25"; - hash = "sha512-eZ9rDYrduKOAzA0XvmJm24IDsI0sDUfgDI9JhM92cDztXaHenaZzlDFESUZJEHSbEiWx9a0wj0C8nS4BMUzCUA=="; - }) ]; }; targetPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "8.0.25"; - hash = "sha512-30GieR4glcXhFNWNdJAb/JmKp5xTRk0rt88pEwa1XZjpM5Kzjo8s/V6VxMkePPD6k0qS29MrpWE4wqMe85htew=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "8.0.25"; - hash = "sha512-XEuocp4I6d8A+8c6t1OyDl7qDs1zV6/R6AGV/lu0f69cXItdVxZtLvDjzYW5TBeQ9Tx0r5PH6Qid7Pq/OQZysQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "8.0.25"; - hash = "sha512-UDSHypbfdYcq5mzR6hDGKmvyDX9Rxg/qKfWsbfqaJcqE7Pz7PbmBzPvLpRc5ctllsdH6Gy3YPcRuUPuHZFNPOQ=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-GIWmk/+AVDyoJgiFtf+FcpDSLWpTtE4beLpP22qwIyE4eFZzx1qDU1Yr5SRsDrSmgf5F8wrf7IylWJs4jwFaXA=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-D96Tyfln5axyYUnR+HkaNcaQmHwU8BpSBDyX6XKjlN8Y8NpTdLrBjbocpe00PHdzX/8QuryY7lqpwtG0WMW5BA=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-daYe+APwzRVJbJgI6hDok0JdiVpT3d3ct5wlA7reVTAbPt3Mp2P82FCzWF9TigAjfDjC8cXvFYTsXMJoJqsU9A=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-T3n/RBRo8gtkFpFtul9CDitghlBTjmRny4jb3a/rGiwpvzAo01b9hDBcnk+CcAoOb2CPvlbeleuf5QRAdPGKyQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; - version = "8.0.25"; - hash = "sha512-OW0ECKvCxfK0SPLWgZ0BA7gXiZUUjIx9KzBklg78EGZfiP9EYPG+glViqmRkqc1gERQKTuaMUdEL7Rhe7z0lOA=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.25"; hash = "sha512-7Qa7XvKR9VSBFk1dllIs395MQ4Gxl0RJqk6cyBAlG1PpIq3kju+4u01ug7C4eJGcVcjmzRMZO8YIYRtpyN9pdw=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "8.0.25"; - hash = "sha512-tYBwWufBKmR0yWGZ6VHEEFQA0z+7n2jpfdphH37KDd/qZy1lgyut5ArI3JjTtlQYQgfL3hcV2RN4APaULYl63g=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.25"; hash = "sha512-nFnoLX+jwF4HXUC4Jry2mK6BBzbm2LTGw38LyhqFRzcEpe8sfNsihXlHx+d+XKnDy/axQangzRi4C2LZ0Kg+2w=="; }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-t+smpWUJHdEv98JlFYD2E1C+BXyFczA9LULzy3ZDKg0XBVp/zPmfo4pX0kCCCTfpmosShttU2UqEbIH8sFCDSQ=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-y7d6pzVJsuGmNki/MXfvKcvZXMC2ycRZ+fG4xRQXEQu+8WvGqcx7NLEAfia772iQS4LNF1C9bPHZlVUDXsOHoQ=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-sTmuWB5gKE/5H7HPw4rKWlSOToqgwmbq32KvmPOUOaXG1DfPQJCqXwhIuCabL579diYq1v2eGw1e1dVWdKuXQg=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-LdtcUpGlqOC0cBf1ahtmYdQf5TOl3oFuVDk6mTkuXNUhXyF7ZWtrYODU/TkSRjr5QiqQimHSOuK1y1xHer99zw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; - version = "8.0.25"; - hash = "sha512-8CSPcnFMHKkpJjCUS7GgWLWmjfqH9AtuMzsnPNwe+lKIP2HxDwgd4Q/jlliZkv80DQ6YbCRSjSCTg4j+tVlpqg=="; - }) ]; linux-x64 = [ (fetchNupkg { @@ -262,157 +66,11 @@ let version = "8.0.25"; hash = "sha512-s6WnkKOwSSD1HDmQGrk/VOEy2JH0qUMp442bc0MAMLdzvZOLp3ETS7zObJ2kBmB9TqHEjzcybCjsNbApoLDLFQ=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "8.0.25"; - hash = "sha512-vaunU9Pxox7xBrR8hJ2THyifEbu9d1tIG5eXqr8XTZIxxJiyshvYF5nn0uiTh1C/FoogvkllTe4cjsmcqBVqUw=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.25"; hash = "sha512-XJTKpxcUhrLt7TaoBELOb1iQUFYICtakHa5pK2vTTgcsb6GpVxYFvzyJDPDEbMdK9s6/iyKysWi1o/MUAE3qKQ=="; }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-hn4OAd2trVQi3EumT8EOKL9N7WperpZ2CR7YLeob8zxG21kLDKzbJi1+YkS4S/HTIt5o6PF2+ag6OyzBte3a+A=="; - }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-U3h/rme/6rxpB0yY6RV0NB18pfkEI/BNkYvRYayVOiUzUn8VCpoS57MXb7ybGuzelBnm/BTIkvOCPPUgbOTpPg=="; - }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-V1Y/+La7P6tCf6IOI9qsk3YECGWbNHfkgiq2UImqw3VXRUolrsabSnH4Hfuct3UE20zINc1ht5YzJ2N/Dua5wQ=="; - }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-EMJtrTcualEAZfCJXlCjnQLxCApd9ChdauEeibxPqclYfEhTULXFKxPUHjmmFmCd/IwdDEVSNIXz+RtaorVC/w=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; - version = "8.0.25"; - hash = "sha512-0WLXarvW7HeX67KVelSKgZ1gwaYxbFgJZRSVYPWzGMHOsC/CKlL3z2Nb9JKsEDuveg0RMa+VrzbNyuygXEL8ug=="; - }) - ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "8.0.25"; - hash = "sha512-Ed/m7srCdqbWQKnCHN/S9LoeeAtenbW0q7sZ3t7bEkPZqQeoYl5x4AXrjTTFyK0+v7G7xFpdDU5tJhLCjMAZdw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "8.0.25"; - hash = "sha512-mKFajoj3yKTWCflyBZui0mVyLyP78xOTdkyW2NPz/Gs2+qaEZlZVZ+0RJ5BWLjL82rqKnF9ATBSolMkq1pIbzA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "8.0.25"; - hash = "sha512-462gL45vRTFbJIjlQmA6NkxnZbJZxXvtv53iya+SQQ4VM15gSgelR9m8y1MwDIciqThtD5x3nm+3BpamPbaryw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-kMo3dz/KtKjf1npo8s8niLjB6Zk+QSOaAQigo6Gm9kvmLAe8eVlyrqrUsXCGK/leNdiGDWzch0L+nxoATpKSHw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-0WzPkm4ykvpRtHAL73AzNOkU4oUB3SxFsCnPHV9WkWbpG8dGJri7Z3MweCucdnffA8WyIcaG8R6lwCmgjGgp7w=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-q0wy0rMPDDCRRSjL/D8tEovs+SveYQL6pBa7mME6u3JgMRN9XP/PQwGnxahS5/07/D2RR9nAK5qq9xhudv34FA=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-4N2e6Bmw8d/eLIisGGvc5wkdQ61cphwfNGgQ/99Dsfr0/kl3PMovG8XscPNEmZHbKPWlb8pfCcE6MOiBSomwEg=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "8.0.25"; - hash = "sha512-DEaIWo8h+bRnPFsuO5F38+MCaSF1tnulteC+6d6LeDoC54W3K2qUFgH+LR+K+pSxu8BMSzGNSWPp2YJdcZ0GXA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "8.0.25"; - hash = "sha512-oAI0pinclefbjLR55uxCU4lQzJKuSwdbgjs5fgGnECmXaUvgXhtGfw2ZZqs6xXNTTrciiLbtrj6xVtnQc+yAMw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "8.0.25"; - hash = "sha512-R/MYKiITDkUwmgStgZj/pQIis6EYrhpha7pqtgh+BUPN2nOY9r55ZgniV+fnekra/79UF+7ckwvZhAi7qh8/Yg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-cJx+UGgTgS7eLtctXtY1asaZELK4MoAp45tiFtSv99uJPTYuTcPj5nql5c5qyV1O67+M88j1COg0df/b/ADdbg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-eawUKDA8m6mWR1nC5xz428CU9OpFDheRDAAiF5XR9BPOXwCGk/lnnYfybFQ2owchPP6rRfpy3QPo2Mfh4Uc19A=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-p+pERqwKzLrQuD5bLZ8Baph/wSBlVenjTols0os4A/UzgJFUFPV3Yd/bwIodS0Xu979kWdi/T7R7UJ1tIDprZA=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-QVvfHc1zDq2q/BfEMVi2GZMI2Wh6KnNFRwhwTu5zvkM5UYJCOveuUD2vtR1Y0OYKJDumD0wdzvvGh+xNV27gpQ=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "8.0.25"; - hash = "sha512-Kwf6rU4HTiujXCinQoLoMwT6tNU1mlSI/1Sg3dVTmPimhVevMe4sBJ75dovoc953W2HBrpGKLwEQY/Rnp8J62g=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "8.0.25"; - hash = "sha512-ZsUjIrLEGodtiP1D9niDnCehUjn3uY21cqVxfWW+qm8pePL955R5pdl7QEN4uY4xIAtuEFPfiXUWb53XjyYcTQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "8.0.25"; - hash = "sha512-cUilAUpHG535Zs+rW0w0VkaS/MbjgjsLGssJKdyFCNehIdR+4+RU8NM8eQNIZaURqkdywu9mQHECfH4Yk/1NQw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-SJJ1dVtMi8OC3/BROSdUbuiCF4HcZiD/U4eH5OPjW3xkBsp23bONvjAKHGwogK3VC5ppolVLSHtSKxVEahqygA=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-0H2OFbTbBPsf0P2V5DXfoZQ9aB/NTT7ptBVu12t+hn3p8rTztSOLKvgFkB7W4H/jFs/q7gx/+TdxrAMH5sTI+w=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-9nsf3lm+4E3FT6tB/FJcci0d6pLRfpvacHEFYyfQIAn0CpE6AxfNaS988+G1f4whvf9BH93Ksr/6zid2qYDZ9A=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-A/l9S4D7J8+b8aQRBGFLhFKvA/hursAM+he4b7H6sacsqLBX1jKdKUJoN1PbS+uhSg5mLSqUcmOJi2RuVgvf8A=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; - version = "8.0.25"; - hash = "sha512-cYltFLxAUdDdZ2xkHGegVCRQLz0zD7jBsepmLKCau3G83jNvEk6ylI9uLlD731+LRT0Yq14oydbSxAQ/yaK6TA=="; - }) ]; osx-arm64 = [ (fetchNupkg { @@ -420,41 +78,11 @@ let version = "8.0.25"; hash = "sha512-9l5Gtkz1kOH+cLgUDnmYDoIXB75lIQ39vp/6DlyRxm7PqNLBP3PXuNNHnGJ/cyvy5nER6DExV45HCi5A1aKr/w=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "8.0.25"; - hash = "sha512-d7Uv5YGawAHbFPkwIz2RuGDI9+74/zwUOdF2AOZ/tOIYmn01xXnVMeFrf1Z4FMgVLFdA6nZTAMy0WFANXojhtA=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.25"; hash = "sha512-UcgDIJx4+Zh3yNrnwDJoXlA9IpugIUDp0niYFyw/U18c9jI4MT51YGLGlI7vy7IkOVA7O0mJcLABrABLKlcKbg=="; }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-KLZPRcwFLqUil/QaPIE0CSXIXM5e1olDQOpWXjBWkPuEj/8zX5A3PFuiowG+8yoC8r5jP8RzjwdV0Y/qeAsfaQ=="; - }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-b4iYO3mLGUU7reVLhyji8jm8ocWrA3YC+W2bUxQtbl1xCw9jEYtVdqTXx9HNmE/71mGDVPHSvgoo1tnVagVMzg=="; - }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-rWtj0wYv4/WfBtHLiaUfNkHf1j+fDGqbJrwus8vPJ2SBdQhqdhJ0km34tZw6yRqjE8/QK8ZCnMW75fuXIvO4UA=="; - }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-Dy1knVjNSOsXuo3WiUGeEfTFM4pZzc7RU6fClGJ6QY//B5wxmQ9O3UjTO563XgY3zdxqqAIiU2+PRajXKMn3Ug=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; - version = "8.0.25"; - hash = "sha512-BlhX9ZFiZiLJjsnd+u3Es4SoF25Sseh13xVRuX9qSj+zbdDT0WrSc3AqKhX7T+iHYHmOvAhF6hVioCOXX3k25g=="; - }) ]; osx-x64 = [ (fetchNupkg { @@ -462,162 +90,11 @@ let version = "8.0.25"; hash = "sha512-c0jEySkvlVvHmH1Cst9CK/1heZt20GRwOfItWm4ng513VEfu0EbbJ1Z2UYxgBOvDruCdLv0z+lLbS1yxZdsyHA=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "8.0.25"; - hash = "sha512-aAwELUtrEsgixKnFRYquT4DFu0DPevr32SfSI+hkjF+v+TA5bbw5vJehfgaa/g5ubWsmgsoLBNXfmdygI74e0g=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.25"; hash = "sha512-iufUmvbhlMAtLdFwCU1LFA17fFbhE/eYg6dLVxmPxvwPDVEyOoJqdlWQAH4vvOh8A2gTbEG56qSSWDKmUuq37g=="; }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-qILNnBa5HVaQK3Qnt13nUcpU5RxAjCxnmXjgBE6VgVGC5vInaj6piP5nOEMQgg7qKx8Ia7sO6b0zNfpLqpX2GA=="; - }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-jojJqpPkKEfFpAR85UmaCA7CfF5Qg/QOUI1lYNLGb+uhci7QKLuljMNpkM8cLB3oYXR8rqtO8zW4VF/WWXKGtA=="; - }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-GTM9x1fhwXHEb8C4SjoFSaFH8jJJQtjBngR1X8BsPmSzQw5ivbtzquShitymrmBZN0wubh8VfqBW1IoiNRVfyg=="; - }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-awiQPtoO8oeDUfXublVnsv9NL2RnI+CrX3Gkffv/c6p6Mgu1bZvCUfsWZ1vigib7LMEHa8aksTtiw3rOSVxazQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; - version = "8.0.25"; - hash = "sha512-FoIQgcIP/UQMIgPDglDd3CwTeeABeHbeZwo92tVikOHfwRoZfJ6tU5CsouGD5OCSQp1tAA9NUqDWUTZw8zChDA=="; - }) - ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "8.0.25"; - hash = "sha512-EpzOSe9pa+WjHW/P8+3J45nJ93b/ip9M90jn0R+iB4Rc28B2Pyh0jAtTqkHZOp5oMtznipWY5zuRmXbgFpUzAA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "8.0.25"; - hash = "sha512-Py/14ZpH+MnNYQ+IM98CdSGOAu10qI+KuQpVgPPUnPyxuTqEsI/CG2VeHa1l7Gvz/BCADkQo8FqgNJu8323MEQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "8.0.25"; - hash = "sha512-gK/53iv85vbUPb8CnLh6PPWxS9EHwtIPPPcxHFKTgNPO0mcXB+e3P5svSuEvfe9Yp/dE4l2E9UfDugcNSa8JxA=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-pB1agArWNDwpK1dctWYsoNfUkQ9qUH8J7l8X6ocVFfaa4cgHU/MYT8vQ1mfjIPEyXWC/ljvNJs74lqnh3jhybw=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-LFwA+JpKwhlFLvZXnAUIbIdTQCRCOhBUHBIzonp+rXEvXx0I82z7QZ33ujNoXSa8VZwmhp33CILo9+u2gIg+Lg=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-/iBO/75csujkLRenu3NrcuISyNpiY3NucZ62PXspChFZxI/2Hd9HPYSXrxyjcbiX/SXlFD/zIyhpQtfJzIxFuA=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-hq84uCcxOWYHhG/BuezuMbjeuZZddL72p31TwE9K4WWWnhoiXBcDsZcc7j43ClxXtlnSZIVvWerDfZYfRiyJRg=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "8.0.25"; - hash = "sha512-gviCU2Sq/CUzGDp7kQauzbMk5cpoCgN+sh6FpLLGJ4IVchyeqq7UQUamnHtqIGFJdPEsqdZ95cl2Sdh++uBlQA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "8.0.25"; - hash = "sha512-ausHdlWALgtBF+mvt3vWiSZq4KqTreVPmDtHMI2uarGb96M17QWu14uhhctTrGsPBcc7x4hTYBuK9V43ArUAFg=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "8.0.25"; - hash = "sha512-UkxLgMmbfnG+xF0G8t1Pd92UII+9KqgmxKNzejjTW1Ox+DCwrC05MmplM76vLsDOdaO87is325RbtdNRSaiERw=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-SKdopTlwBgWYqPT37+5Pbe6IKmznsrwA1zX7kua4PB+DdbmkS2b4nYa9DuZIgbCWWL3C+mjloxSmFzK6lOBAhA=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-yBgoCW+BBdwC0syp/FQnIkvehxFuJhPPrIoXaaOfMaJdABNE2fV4QZ7t25um+GKAXhQSFYASXZTk94nrm42KVw=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-A3bIR2BHvxFOoENcWP5TqJAuUBqDwOLgK3fa+XtFWu0Rtp9ZrYKyRoHVbqqHirWWvzN0HWOZI4x4OaFas8kfFg=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-h5Ek4mjDjouQ4ZgoC9W0kh7WzwYtpSJrLHjiSUkMu2SE9/n5lY27kRtPe+A4r6rzLfEEd35SToq20nO3vK3kYA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; - version = "8.0.25"; - hash = "sha512-WSkPeQpku8Ur2WKUsHMX7vxa9vmxSNw3XtO2LA/9HxaGXqgHo9LVCRffqBxIjz76vKqvbWjZjtTj8eQ8KaTtYw=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "8.0.25"; - hash = "sha512-n8aPpFWVirne/jRH2/w9+q1+mUzyqodJWuSJBRi2LvvqR25LcneuBOk3fvL2QOn/HDsAOoZ50weP/bay+iar+g=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "8.0.25"; - hash = "sha512-5dlpmlUU3S3Y7yB7XfS3TJZBthw9enB6Jv8I1QptRGtVr12wVljSmkUbUE5tujou5im1hhlxKA4LKO98tGynHw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "8.0.25"; - hash = "sha512-pxV9H1TBTznSSjg6EJUwh6HzAHN13sPqSFcLznfoTeDiq+VFt+vbCbuGR/QZIW2fiT85sP89r98t0BZlH9JG8A=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "8.0.25"; - hash = "sha512-IZgxYw2JOLsXiDW6/AEi8C7GfbPllOsHssqcG9PKHAVcwlfhfVI+ZWjwHJlT0Jgv6239+2NKKUxMje1g79/UJw=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; - version = "8.0.25"; - hash = "sha512-qX0vaUvmMLiyaQ2EUI+khMuZ6R1lR2HLZAUBTMvxlOPccfP0VoYxQKEZFKp4GuyHtwBdGZTtPB962wz5hhjveQ=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; - version = "8.0.25"; - hash = "sha512-GNutinDHEuMwy1oDYCZ8huW/0sfCDHNwE8/dKXSpHdAymYcKqMZ6za9WQDyh4ZxW4LtaHKtL6/wDx2ksHgU+NA=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; - version = "8.0.25"; - hash = "sha512-cJbqrcQRgzXO0GfH93xRApzWTlb/lXFngDc2W8ExcLMzEOcF3nZBLhe+w8uYKeqhcEM++HzzwY+vWOPllxqvaQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; - version = "8.0.25"; - hash = "sha512-qVmF5yIDylqNTgRgpveqPK3+QYeLmKR8ADQLi/uUpOebXg5MrcxPdxM1UiYlXLPzilOxPfbkimrLmXGdHEuMeQ=="; - }) ]; }; @@ -628,10 +105,6 @@ rec { aspnetcore_8_0 = buildAspNetCore { version = "8.0.25"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-arm.tar.gz"; - hash = "sha512-2CL6ZEB474zJGgC5YSgdYr85JsUwwgmMSOKldg0FJjYz+E2UAYzPbJXJlVNhgLscn+Yfl0cRHqyzIVrAlIeAxQ=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-arm64.tar.gz"; hash = "sha512-Zdixa775DETarJBqr5KBj0OoSCGR2/PyC93N0a1gd9F7YXg2S9CCSVAd3TAhpMj1+YocA2DhJocNsUzwbNEnJw=="; @@ -640,18 +113,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-x64.tar.gz"; hash = "sha512-3bZqw2YlKrOCJxJBs+U6dSAdLISMnshwon+xeKbbGOTZSbmJaj2FMNA9JV9P1R1jU2e+3aPZ88Z3y1lnhNvLnA=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-musl-arm.tar.gz"; - hash = "sha512-0vNZqg1Cs624UprqiWyXH9+f7tDmeWZZAQ37Uc8VO0njBifgWkjwlWKXNi+gWaaiNlXrkYXjmfFT5obp+C7N4g=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-musl-arm64.tar.gz"; - hash = "sha512-EmsxuLof4zZN/Nk4jHJGX6ov23slHHgxCG7DF081YHXnIG0z9I/BrjfDNdyw9zm634JSE5Ha00xkCh+xlynWGw=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-linux-musl-x64.tar.gz"; - hash = "sha512-mUQw4j1G/GSOqWVzscqy8RWM/0rtf9PF3vUrTmOoT7FjWr/ugyjS+TZu99S0LdzZCaagKK8TeK4OtUlQSpxXyg=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.25/aspnetcore-runtime-8.0.25-osx-arm64.tar.gz"; hash = "sha512-J4g4l5Dea2BPrvUsV4WewpStGYzV3ZuMSu0VoVy4E3ywUgPBdFaCeSZXPc1mvGOqyM7gXSg9hoZ2BC1HNZMjIA=="; @@ -666,10 +127,6 @@ rec { runtime_8_0 = buildNetRuntime { version = "8.0.25"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-arm.tar.gz"; - hash = "sha512-HRg683h9wTLbngLRh7nNAZzwOkAnU/pJIbNHEeOMX5FJSwa3nxB3wlvFu9ipj7fHjEOy5rBKedQdtTGFSrm+7w=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-arm64.tar.gz"; hash = "sha512-7tI/mVisrdxuS4OO7XX9M9LFzWb8Z9CWoFxgvMiDWYKInSxVlHytxHybz8PaRl0wf3oD4NOrZoKxYiM6s7Xcpw=="; @@ -678,18 +135,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-x64.tar.gz"; hash = "sha512-pd4hhX/lFp7HjHBMcWOp1kh6dVOWZRwkEtJC/8JhTHVxGGysTDtOTJnnvfcWZ20opZ1JmGLGpv17gYDR45lzgw=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-musl-arm.tar.gz"; - hash = "sha512-LAt8fu27DwYLF/Ir3BGNfQuAtfeC1MOd6CZDYpMhQgJ9Sa/ONs29hyLgvYKLwWKl4eQH2MT6DTJoguQ9ZVazRg=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-musl-arm64.tar.gz"; - hash = "sha512-Oql0IFsj1f2tF2E5H5LbAFbpjcffNPvNm08Jq8pHAczXVyaSuzonxIsffa0ncL5QniS8iauojCH9JFDcM7jFaA=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-linux-musl-x64.tar.gz"; - hash = "sha512-Kqlnc4rgRGHONUy0hlgte30u11IeJlusD88DiAM1ZIOo/CMuQ5a0R8tcVbGLNDcn57KSKsVmHaO9LbXeDHMWow=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.25/dotnet-runtime-8.0.25-osx-arm64.tar.gz"; hash = "sha512-0gNqLlM+aIoVFkNJPCVIg6lV1U5QnjDLuHuQl/eMpMNu4rgDoDEM1XGwjJqFxpRQTyZcD4iE+bDHmNx0n80cow=="; @@ -704,10 +149,6 @@ rec { sdk_8_0_1xx = buildNetSdk { version = "8.0.125"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-arm.tar.gz"; - hash = "sha512-qOhXRciZHNWGzLnGwmLgBp/SjPjkpeRt/GgX8Gp1WaPFpHXSyVCrC+yeixxRaavXJrRN1K4Da8+vuhlcJ0WpTg=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-arm64.tar.gz"; hash = "sha512-sbLwkjJUAcwxK0Enb1DhiLAin2+HQgxkjRqwXahtxAe8koqblTztFad5z8r+6eNPCACUE1aLA5nHJ/i/cbccvA=="; @@ -716,18 +157,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-x64.tar.gz"; hash = "sha512-KXOFSrkK9U8sYmqAMvTftBv+3Vkh8dW5pLaDKJJ+eF5ciqaT0k9zkwTKRtmk9ahAgfqUuEUuH0+DBAqOWCorNw=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-musl-arm.tar.gz"; - hash = "sha512-ld1t8kFRa2ZemOsirZBRVf+p9G1vYcKkNEkbc0Jq0Ii0DlfjkATmI1Y1dYDApgQGLMdKfCWz5LxHGwpbYiCDOA=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-musl-arm64.tar.gz"; - hash = "sha512-+pcYdflda2H82w5lPI/YByTsDL0218Dy1i0od92g8MmU23zLSclJBzkDuoL1gJEDEpUWMUFTuGGtx5uJvjH75g=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-linux-musl-x64.tar.gz"; - hash = "sha512-0YcLJj7ieU4NcTkbnYhiptVdxcbVHn+yxuuzwBerwASmMuE4MQGPUkjhmhXTcXWTV4ycdRxNwg0SNR5ACycTHw=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.125/dotnet-sdk-8.0.125-osx-arm64.tar.gz"; hash = "sha512-9qxDRPN0NM4U/JiPT756O5LfScjQdXjHBLFBX0BBArCi6kSzmJV570Pi3njluMJSOtMFDya9PrHDGHwnyEAOmA=="; diff --git a/pkgs/development/compilers/dotnet/8.0/deps.json b/pkgs/development/compilers/dotnet/8.0/deps.json index 77bfd48b0c9b..9336bd0b2b49 100644 --- a/pkgs/development/compilers/dotnet/8.0/deps.json +++ b/pkgs/development/compilers/dotnet/8.0/deps.json @@ -1,64 +1,10 @@ [ - { - "hash": "sha256-leB3BeFiEW80loMANJRgtUSCbHMamTXEcLlTAOgHTS8=", - "pname": "Microsoft.Build.Framework", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.8.43/microsoft.build.framework.17.8.43.nupkg", - "version": "17.8.43" - }, - { - "hash": "sha256-dy4sbWvMOAtAeSKoIvWlVMAfLcqQLI1QExFIvdAgM1k=", - "pname": "Microsoft.Build.Tasks.Core", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.8.43/microsoft.build.tasks.core.17.8.43.nupkg", - "version": "17.8.43" - }, - { - "hash": "sha256-/5X592Hw0E18e2SqOxsBLUGcvlRfSqXsHRPfv80MBkg=", - "pname": "Microsoft.Build.Utilities.Core", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.8.43/microsoft.build.utilities.core.17.8.43.nupkg", - "version": "17.8.43" - }, - { - "hash": "sha256-ngvdiRCFgjbBLrc5Fk8fpBPwmsCW5ZJK4TAQ9pDRS94=", - "pname": "Microsoft.NET.StringTools", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.8.43/microsoft.net.stringtools.17.8.43.nupkg", - "version": "17.8.43" - }, - { - "hash": "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ=", - "pname": "Microsoft.VisualStudio.Setup.Configuration.Interop", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg", - "version": "3.2.2146" - }, { "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=", "pname": "Newtonsoft.Json", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/13.0.1/newtonsoft.json.13.0.1.nupkg", "version": "13.0.1" }, - { - "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM=", - "pname": "System.Formats.Asn1", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/8.0.1/system.formats.asn1.8.0.1.nupkg", - "version": "8.0.1" - }, - { - "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE=", - "pname": "System.Reflection.Metadata", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/8.0.0/system.reflection.metadata.8.0.0.nupkg", - "version": "8.0.0" - }, - { - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=", - "pname": "System.Text.Json", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.5/system.text.json.8.0.5.nupkg", - "version": "8.0.5" - }, - { - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=", - "pname": "System.Text.Json", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.5/system.text.json.8.0.5.nupkg", - "version": "8.0.5" - }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", "sha256": "519351be7f7c75add08cc9b16a3cb86ed71acb3e06a8dfa2a6cd0e48a83281a5", diff --git a/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix index 02267a96f8ce..7fcab56747a0 100644 --- a/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix +++ b/pkgs/development/compilers/dotnet/9.0/bootstrap-sdk.nix @@ -9,26 +9,6 @@ let commonPackages = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Ref"; - version = "9.0.14"; - hash = "sha512-qSgGFleE4ZvBb3DExY0wkNyZtDeGReZMtn+iM5TP40PnFq3246hVF7m7Fj+moMXeLswsC6+6iFh0rIPRJMAcag=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-oY4TEsvQZC5DqjbkzxFU1n8+XKLcmAOEzGGAH4Xpq5iSDTT49Qcpl0FmHat9eUTa+Hkjqh6De9ewzvQIlucI2Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Ref"; - version = "9.0.14"; - hash = "sha512-nBzLKh7NdmLgA3tUaNZmiFrG3g3FtHElfZi7VE5h1VJJlgPiLehVf6iDUDraWSB9sm23ibSV4z2lxxtxaxmX+w=="; - }) - (fetchNupkg { - pname = "Microsoft.DotNet.ILCompiler"; - version = "9.0.14"; - hash = "sha512-1zyv3HlPHpU4St6gEOHzglfJsTWTdN48dtfLRZEw9ruPI9j1cZ5O/Cj4es635TSpz7VnAi10yFVr7Ye6+vH68Q=="; - }) (fetchNupkg { pname = "Microsoft.NET.ILLink.Tasks"; version = "9.0.14"; @@ -37,19 +17,22 @@ let ]; hostPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; - version = "9.0.14"; - hash = "sha512-oTVfDmsgrSyLh8NJlIe9tLkw4aCtPSwLUGMTbQTlxAEmeleZXmJuN81UfnkJAdKdG5sivLiQRWwCDG0faBnoMw=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "9.0.14"; hash = "sha512-KfRzkAToFV4pgZuiLVXlyw4RbuGYsSAiAvZZQOno6Bv//zX1zTyJJiVcxlJ9fh92cDS8uJz+PaJ/ejhOHs5oWw=="; }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; + version = "9.0.14"; + hash = "sha512-HwEHZLrgvrqc9GIQjcgg82bXj/m/czjG83IXMvg4y8qRsazVzJRwXn4f6pvR8Go4PTHADHN2odZ1RA7oR+o6QA=="; + }) + (fetchNupkg { + pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; + version = "9.0.14"; + hash = "sha512-gOGZh9SXiPP30Hq3jNNy6XyRHGy+imGddd+vITJiP0OO4B43YgBIzcaPytEzM3YPNeB9DHHZxgKenouAybqogQ=="; + }) (fetchNupkg { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.14"; @@ -62,49 +45,38 @@ let version = "9.0.14"; hash = "sha512-hIhDoJ1Je7kTlBjVaQEa8Ea2v9YNzHFpjTgHTuuE+uXw85mMA30+FU04rHd6ItX7i5oEYR2qfBSe2IvLtvsrZw=="; }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; + version = "9.0.14"; + hash = "sha512-gR+yvtmxVFmAlwoFJ4wCyg991R3yLBacoOyIH+XnZYJdXy/L7a413nVGoqNpre09YT9MDlj8AVhp06elEI4ifA=="; + }) + (fetchNupkg { + pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; + version = "9.0.14"; + hash = "sha512-llH6vLel6SlPJuM7ujDqY9ZsPfkXglVlF1EozKPTdzVarxzfy3xbFnFxoUH0Ubl4KYIC7F22+SFA0gIX4lT7Qg=="; + }) (fetchNupkg { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.14"; hash = "sha512-cgIB1paNuwG20tY2h30OJrWH3f2XMGUTf3PH5qUEbM8Pnx/trvofuRhzCcmdiIMCw7uG0Z8fGusOslH2a2u++g=="; }) ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; - version = "9.0.14"; - hash = "sha512-k1438qjynTL1eptYrRrmrg1jA2fjz9r0Bk+ltiex9kyEh6+cBbKxn2LaCCsf//Q6WU1sgEBAgJfnrK0hVQ0RIw=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; - version = "9.0.14"; - hash = "sha512-jQy+3YpdZKdohZnPleV0sBUTagxF3R2JE4zxwbw0H9RjiRCIWJA73NliPGXtLZUp/wBRQ/uyb3f6exCgNbebdw=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.14"; - hash = "sha512-dWm61FQAslco/9j9JsuwHVL73Id80BPdZbnj3eQCanrML6VfkpLN6qFUZjHVnY8sK32oPO5vXKXI5l6iyfc+Vw=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; - version = "9.0.14"; - hash = "sha512-NpmKObqpu0rbcsinVsQ/+ljJLdshU0itfaLwvOXd6T/Elv+YiaVQQJs9zauEqjXPQzJ4/fQsPje7WwDOUspR4w=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.14"; - hash = "sha512-/uABIz7gXDWtRK1w8GLw6BOcMCb7nxjtxiFiTgnEQZuR/rSe9GIfZtYx02xEYPmd50C2IKdijxr3Xl9RU2h5fQ=="; - }) - ]; osx-arm64 = [ (fetchNupkg { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "9.0.14"; hash = "sha512-tl/iXIYlI4kpxftKdZkMzfS0iaXoFS3rZaLjf6n+nhOUPBR3iHfciHRCgClIFBIDkz03PMmSQYgJgfEmb1CIWw=="; }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; + version = "9.0.14"; + hash = "sha512-l9EKeutIuK8ZYHfRLO4JNTgsCv9zwD7bNU27rkfkG00PJWzoIVutTGMLYf1OiYCKVJtawXQcfSgC74cYDDrPnQ=="; + }) + (fetchNupkg { + pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; + version = "9.0.14"; + hash = "sha512-lkKYv2JhU5a6Ywil9qz2JBBBj8Qt8svswGIe0NG7BVi86vInbJAJWJZHBiwvG+3YmonYhbkEIPQ+xFWdONh8GA=="; + }) (fetchNupkg { pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler"; version = "9.0.14"; @@ -117,89 +89,36 @@ let version = "9.0.14"; hash = "sha512-BS0EiLj7JtUJ7i9r63LNSqMIQwVbgvCbVgNDkA3vvhy97/BP1zS0R1hcF3AVZTEiF6TRpk/MRJmsNoYwS7bdZw=="; }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; + version = "9.0.14"; + hash = "sha512-BXoutYs8qFdBSjtaRqrauyJZqS2CLI1NVuxtchwdg9aQxX9xG4Hc4POIqvFrZaRoVrcpxtGCSEbg6vvDWCJBrA=="; + }) + (fetchNupkg { + pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; + version = "9.0.14"; + hash = "sha512-KVeVExPnYZITgzP6Au2IaxTOES6vhIvhPOPPa7Z6DwsSu6Zd6t03HxM6JyU5/D2nKofjBnvcPjKW+zS6gA5zCg=="; + }) (fetchNupkg { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "9.0.14"; hash = "sha512-ltQrtUR4/z8hmlSSkV2dU0rBHmAIWNmKmpetNqTJY233SeVjbgieza3EAS8tYMhJHXAGaqjk84Em8qPaemefDA=="; }) ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-arm64"; - version = "9.0.14"; - hash = "sha512-glpxsqvwHefKH1cnUUshgCoFDS7xRFjm+O4V+16GncKB/ONcEZIGm8WwnEaRCdqu/Uggsd87x5CJYXI3wIZ4sg=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; - version = "9.0.14"; - hash = "sha512-GVBMo1f82CZW/XjV1zird6w02rfV8qlu/DZtu8IP0nJ+A7744K7Fi6RJNXKJE+C+tqMmlTkylF/mnaxn4UjpSQ=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x64"; - version = "9.0.14"; - hash = "sha512-SePD8uQ7n7Q81G2Psvlo8hPbqkFVYhCvILO8mFSvpqOgY7OiiqQj1sBPZKkNhcVU4CZ7LUUOLH7Wv+4gcobK5A=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; - version = "9.0.14"; - hash = "sha512-5jDtZ0QMVbLvdAvnQy3hrkyBC6SCt1Z2o14cesEiamxpeB/gpgPmAqpqcuWMQFyXoqfWENUm3dAPpTeW2pAQ5w=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.NETCore.App.Crossgen2.win-x86"; - version = "9.0.14"; - hash = "sha512-6VrIMox8q/tUnQHciEhvOj9l8NfWq8NnYfGle7IUYkZnM21fOqcrmF0jgLWXl48QI/xRVVDMlqg+TWT42jdigA=="; - }) - ]; }; targetPackages = { - linux-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; - version = "9.0.14"; - hash = "sha512-hLN+9dSfcJyNarm8hCHI1R+hDYeufiIGRrr9DfsGN/qrPDyS7awpShEwIdsZ+ChMfdxoYDgnrCV/1PClwqOwWw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm"; - version = "9.0.14"; - hash = "sha512-q8AJOVKXCvstKVv/Pdg37mPBf61bFO1u0RoMjksz18LnlQ4xbgzLG5kSILieUg0O95H/rUJ1+rb6dX17fDduaQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-arm"; - version = "9.0.14"; - hash = "sha512-YJaprNxzr6eTrV+zcIZzi9f3wFrjF2KSwG3XvCm5+4vSZ1JFLW8XFQKY/DqIk0UAoEX92W8TJ7ygBXB5FQMh9w=="; - }) - (fetchNupkg { - pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-/bdvIYq3+gSIILJ4R2wdqy4MXC/ZvgbHjQ7jq5fBjUGMiobjsxgab1WRo49Pjc4mGJPLwoggygxgAj5j442mkQ=="; - }) - ]; linux-arm64 = [ (fetchNupkg { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "9.0.14"; hash = "sha512-vKjaQVMP39vBz3CkOpJILVyz+ActsFe0yEvmDOa1EXdR6aCUkpfq89icnlSFWr/oicz9hxGK/cOQgSnRXM2T8Q=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "9.0.14"; - hash = "sha512-GxHFKrzlQ57mYMPXJiZxboJ/rSEecvQgmfvdg7fAnD7c8/JE0AdohboYeCebQEPAOV2R0wEf3LoACUqS3/2y7Q=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "9.0.14"; hash = "sha512-AmLrJ5tBEwPK1VMPdk4Vy3Z6++yGkaL5bpKwGpY9SUL8x6nwQjWfY87snOK99X8NEXltxJNovP0FkRLCi+Zr2g=="; }) - (fetchNupkg { - pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-jHaj6hgSuJ8d4jPFSWyrbyQROhTgMqCFKb+RcNpRf1EJ/0kHbu1vn73qxURYjiol+9jaEjKanJDqZwh76x/tFw=="; - }) ]; linux-x64 = [ (fetchNupkg { @@ -207,87 +126,11 @@ let version = "9.0.14"; hash = "sha512-jYd+5KNUzdo36ytc1Lz4TlAeHhRNMXQr3cdBzYAqCx9wfsOUnqPM24nx7XNvNryawyjPicbdP2wiNBgdQlts7A=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "9.0.14"; - hash = "sha512-++Z4DoiGwsqVoGM3YvXsWoEzLVXSXQvTnIKUfCV/GIa7crEgG34Tb/yYzyJvdFScqrHbgf1gYyYeE67iBhlgDw=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "9.0.14"; hash = "sha512-f7N/o6P9rxLrfKJyyy7pp/7ytpe+CNa9LdyWPjYBSTiVi9bIPq1yXK6MM4PewCkLsoS0jOOEWmfYHrYb5Fw7VA=="; }) - (fetchNupkg { - pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-14RbsWvcKBwytrmEpdFvKhFLif6UDfEjlFsZJ7BGREPDNGXg197CkcJHCvn8nVY5jnEju3zCmlSSgPufgd3U0Q=="; - }) - ]; - linux-musl-arm = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; - version = "9.0.14"; - hash = "sha512-RD/mlV6K5OupTnGDEP5KIFCsqsPaPJnxZh3SEowf/ShRL3djfZqz/a3WJVrpyjt7jpiOlRf+3HPl3pGmqZoOqw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; - version = "9.0.14"; - hash = "sha512-SNuZTEbjDCUasMXqoRCOPR6zkIeaORIj2FZkvUY72M8D9U+hxOjDhf3DltesRmtOFuhDkgB5KNCL6zriAvbung=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; - version = "9.0.14"; - hash = "sha512-7tlCJe1E7aFUXY53OFjLD+LAsblMfMDBDhLXLx3QdYA9IRKopXQrCtAvFQ+i+i56mKs9RVUmg2v+RjxXwP/MUg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-/UEQYhm/+Zo2ulnZiEzP18vqcPWgqnFmlobEvZc9TCVGx205H8XoDsZ5+MU156Vbu2G6K8El2UCJeE8X9qXRbA=="; - }) - ]; - linux-musl-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; - version = "9.0.14"; - hash = "sha512-YWI8RNne2riYIn7tn8+5ewJFIzeskhJ3MfiZEHh17lmixvwPczfW+uqRdHAZ0ERYWpYFO+rO3/4/66WuU4H96Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; - version = "9.0.14"; - hash = "sha512-Ft8hxap4jV64vvOdcomyEJ2b1HFmXE2D1d8Ib0iNcbf/0qyYxosNQQa+Ttzq0AoODWmq6cHdWjPAfYgMQPOM8g=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; - version = "9.0.14"; - hash = "sha512-oF4pLSWyrR96tyVignbQ12gR+6JcozCv1BO9mBy4j70EDsV7vpm3x3PGoA+SaXaDDm+SGddFElx+MOUzB8jEsg=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-ReEgJh8mRp1wRzHjkbIZVcLZyBj7K9KZzYjHhzOCS6gFEF/V/4fesp8MVlzLdXSBV+ZunSUwL5hWWvUlx+nQ9w=="; - }) - ]; - linux-musl-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; - version = "9.0.14"; - hash = "sha512-jSo6p8k62QbPGfCFxRJEnjTJz2HKEV3YP9SXYyTRXnUrXypLzHqU0GUQmgzMGZBM+MTHUEsH6Bhy+r7j1QpICA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; - version = "9.0.14"; - hash = "sha512-H3zVn1SRcQ/anQpfg44zFVsAtkdj8YAdrNVU+dxe/2fB/ZBjVDZaMoTT/d0fd7wyzDxufPE2IVXK7JyeExsrfw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; - version = "9.0.14"; - hash = "sha512-nk3joXKiqVG0ryUg8FqCAlfl1hSqCL5gbTFaIe+vC1eVheitArOaxY4TU+tCsG/XNoskLaAG7ptU1eXMpesung=="; - }) - (fetchNupkg { - pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-UIwm0mfT7u9HLdfVi6uPBt9gplnCCbncc6XNOhYJfEB441j2kDRkKDSVhfXerA2lCut0U4fQQm+i9qGd6dFlKg=="; - }) ]; osx-arm64 = [ (fetchNupkg { @@ -295,21 +138,11 @@ let version = "9.0.14"; hash = "sha512-Nxre0GsAxbGLmlfymqMYsWps0rexVTEyKyCtv4SZs+OnRd16xd3YFoxuqwaqKOSGuDPRIX9yJF/POjWnanA0HQ=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "9.0.14"; - hash = "sha512-S1jr/9rRWM2bUoz7AHALT5frHBnAiHWEb5WhrKuRzJogN1bCDOpGXnkZ0zEHbNIbhTeZbkmMLTkch/ZDBvm8qQ=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "9.0.14"; hash = "sha512-1j/Sem8h5XELOfV/8mnVdXuYcltI0JXAyvzNeC7uBJlH/ic1HZ00TQlWsv0/WIgnHgSTAgNaa1HxnAYL35NITQ=="; }) - (fetchNupkg { - pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-8mOcQRKCm9QisJOZ8GJTV+Z0pStXlnvCAQnmfYFF408Vo9c08bnla0sHRHobFVRxtWqMojvHGHwnUlnp9XrPLw=="; - }) ]; osx-x64 = [ (fetchNupkg { @@ -317,87 +150,11 @@ let version = "9.0.14"; hash = "sha512-DPYynWbPeB1oLDtUxOQLu5SzJQlqQzG01mxGoD1qTjDK1V1a1eVWfKMRZ56tKkIS40zywn8ku7Rpmrf4F4v1CA=="; }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "9.0.14"; - hash = "sha512-3hDLHUaEXPG1j03/fk1vpJZMRQn1TFh3X5yGdFLM2d30R2jcKf0IQruN1x4r9QtOOA2d3WpQJ01pYCd/GK65OA=="; - }) (fetchNupkg { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "9.0.14"; hash = "sha512-2mjykmXgsvwZb6qItFVw5uTNlGE30SdjSbTaDzwElYIo0ZFJHKYMuQsBxJD1GUzets0n+g0Z/dZ+MjddeYI5Vg=="; }) - (fetchNupkg { - pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-fyAsLUnRPvTSnzOax4IQHoSdsrBbAYZ5OtMdulCA1prKJ82ZG80stokdB3vkvLyGqGCg6h7R4VhsZrZRuFKP7A=="; - }) - ]; - win-arm64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; - version = "9.0.14"; - hash = "sha512-fXXqGF24E+d6zQ4JoiTfnlb84ER/G2RsHJRiv5DbljthIGAv5qxnwT4B5C2EdpOvipovF6i8D2z9oDwNwThR4Q=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-arm64"; - version = "9.0.14"; - hash = "sha512-wXiDzelOZOfYgAgHaYNyXq9yFEH9H9JtMIBMAt1XLe7aB9t8ikOi6ki8vW1/xCVyTChQD+gRvFyZ5ndCl3h7Dw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-arm64"; - version = "9.0.14"; - hash = "sha512-X8m5Y7a4RUtBzFkijWHGkKf9RI8ryfPaVKG7U8L6EJQhhlcaPkrR40tsA3kLWu0BrrsSLwYA+QamwZjrubAB9w=="; - }) - (fetchNupkg { - pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-HQXY+yGY+9+Rkmj3g2DwVKQDzhMWANYVsxUD1btokmnQPmznWt8NWwF6pFkCcgFocbzUYTTlmxfKb+LVI928Uw=="; - }) - ]; - win-x64 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "9.0.14"; - hash = "sha512-ACy6Ms3VSZ8yGl8sPOheIzmJf/T4HtkW1ZhYMiYgbA3dAIonrDPvk0SACANEwmLAHUoPSRkZ4xEqDrg0EptzMw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x64"; - version = "9.0.14"; - hash = "sha512-YLy95lsjZts5RPMNk+ahD5LKmKpKMNvtXOqHNdz9DfjG3YEBwzIffGVVs51NkWf93ivLPGcBcn/VAzuW47I3UA=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "9.0.14"; - hash = "sha512-xuo9nZxqdcbn+Q4laeN3a3RXr6fPE49EzLU8uNj506udjEKL58J9IpbKMX3DU9zE7Wp1p7/AY68UkHqOlVtKOg=="; - }) - (fetchNupkg { - pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-LmujYamAcv6GHlRs4xhnRWUKMfW4n9gI1t3w9mVapHfWZ9ErbgvjEJyXNTp4qmB6xIR00ggXLSQGfRuiZV/KqA=="; - }) - ]; - win-x86 = [ - (fetchNupkg { - pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; - version = "9.0.14"; - hash = "sha512-cH6M0YAJOZOl/Nb1lllWqewvsgBZQ8x+ix7QImG5WFvx4nSuUDINRigq8zZeUL1Q05GTsC6U5CVWhY1HrhFdOw=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Host.win-x86"; - version = "9.0.14"; - hash = "sha512-ZYOr/UXKLXLdhsVAvRKZu9mVGdFw7282EBgwvBIUZR8zzVxd4qseapdw9Fhoop1stOtVcgs1RGqnHJdRx5O1UQ=="; - }) - (fetchNupkg { - pname = "Microsoft.NETCore.App.Runtime.win-x86"; - version = "9.0.14"; - hash = "sha512-7Wdn3dL26+J/Gbl4hM4uHARyTcLCv8ugk/gQ18hP6JvUXHkqZZzsOr0bVqTXU8+2/Py+shyIkJM7nqANTCaI1Q=="; - }) - (fetchNupkg { - pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; - version = "9.0.14"; - hash = "sha512-w4B7gwQCiSW+m8ioNz6oYEv8ZD65PuZfPN5nJPegjQeJQJcpPjl8LS5qS4zIIF99tDzL9HdbTd2/ctUwRrVJyg=="; - }) ]; }; @@ -408,10 +165,6 @@ rec { aspnetcore_9_0 = buildAspNetCore { version = "9.0.14"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-arm.tar.gz"; - hash = "sha512-TBC0tyYmkKui6pajHM8MzIRUxlR/BmNwqm7pJjPADoUFw8DOjdh8HFepegYDJ/NMf0QlqFZ+4gEjqbrESbFQYw=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-arm64.tar.gz"; hash = "sha512-xc0FlxycugwhHOtV4ibL+2LxctuDRfpdTkdqTMs6T2HW5R3CstF461XzZzrS1hz3KuZJ+4TM8sPbu9Ss27eBMg=="; @@ -420,18 +173,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-x64.tar.gz"; hash = "sha512-bQlHOQ+ewxYpfyGp7AIlKKJyBaRDKPlBf7hnV4PtxWAi5eFeplZQxec8tzkXwJxSMF0+heTBKs1eEQdIcbsGeQ=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-musl-arm.tar.gz"; - hash = "sha512-zrzx18hUhb1dNIbwRjCB9BN1llCaDnhh4xp7XsNqkMex3nLPKJXojRdIZkC7dZPbK3EQhYo3cbbSM5hlyHwSjQ=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-musl-arm64.tar.gz"; - hash = "sha512-2tBpSpdV081M9ea/4wjqqLkEYTkYTIVzhyKwNuiPF4+NY/mv7RLiZPLEHRPmsYoXr90d77l62IdaIrtILcFhMw=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-linux-musl-x64.tar.gz"; - hash = "sha512-gfkhRH1kcJoln+AIOLN7vUoor9ZZOMqgcYvr/GDrwKohsDHwSQ9KFqrI/6T9rvaBAbK/DX17mSKT1g+3NXqHfQ=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.14/aspnetcore-runtime-9.0.14-osx-arm64.tar.gz"; hash = "sha512-VhV7qrlOtSivrPkhaX1mPrID4RS+mOCKAxUwPQm4+F9y8dGT7tpx5Mg/Tl38hRffUoq4ZJ0XVIt7YTaruvfr/w=="; @@ -446,10 +187,6 @@ rec { runtime_9_0 = buildNetRuntime { version = "9.0.14"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-arm.tar.gz"; - hash = "sha512-K3U+B6gtlvZGzWhpuejfpdmCEElRqEBTcu2RpBo1lqts7bHmnDUjhApXN+qRtuMVzTQSSF+B9wjdtLgul43aTw=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-arm64.tar.gz"; hash = "sha512-D+DekyKzozyyMlbOZJ/lqUlNtUdsUO8lM4bXTp43Ipk87jh9aFAGETGti3fxRUj6E/dyyUhsMq6jzQjjE/dvcg=="; @@ -458,18 +195,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-x64.tar.gz"; hash = "sha512-2w2wuecJ/+Rj3q2U+053ubDHCGu6p4p4qmtTZr73e6PDOJmoHDwa7zwRAnoebN6/SnrTBTK9wZPw3sxxly5d2g=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-musl-arm.tar.gz"; - hash = "sha512-5l8d7bW/Se74Ky0rCE5BPPrNL6VK2QJdGVRo6TNpiDRfjJROxQ2oVTp3vG+fK4S4yPMEGy9pshpAVC9LOn8BsA=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-musl-arm64.tar.gz"; - hash = "sha512-bm7BOWvjDk04/CYgOk7fWotjEHYm6/C+CkFK3hmwuKbJQm7QHPMZiXlogcr4ETjnmtLzR4+Hd1tomVpN120Whg=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-linux-musl-x64.tar.gz"; - hash = "sha512-1tW85BslqLqSgjEI0/k8UajaJffCL+ZcEh4Z7wky2Jc/iMhjvfItHs8ExJjcanI8ZT3jAHeZP2SGWbw5HzkA4g=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.14/dotnet-runtime-9.0.14-osx-arm64.tar.gz"; hash = "sha512-I+bbmZG+jlrTsGD0/oKGAXa/Qx+zSR2f1lZyWTvQBLqshg1JuoOozYRHZqcUGwcMj6jQyKXQ+mi5uNFTsKk72g=="; @@ -484,10 +209,6 @@ rec { sdk_9_0_1xx = buildNetSdk { version = "9.0.115"; srcs = { - linux-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-arm.tar.gz"; - hash = "sha512-cAanOGAWneLKPb7IlfGYYlxHLDxKEueHqUyGVFei4vLIWh3Mog7nwl/j1xa/tIdri7E7LN0nv/g8QH4dDsOZOA=="; - }; linux-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-arm64.tar.gz"; hash = "sha512-zJhNLUXOnu0k3Xih2SG0GbgRMZJ66RC6UL0oCfZMxADGUlJAJwUyopA6VPWQjEWAmGTMNUZVqLpEUBcmN9z+cg=="; @@ -496,18 +217,6 @@ rec { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-x64.tar.gz"; hash = "sha512-g38je4D8WM3Jf4AVTHz+UFpzKNyTxUFAZwdhBVq1bUHaEfhiDlAKpAVXhqfuCxOLW3Nga0vOThLIYBukJtOtgw=="; }; - linux-musl-arm = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-musl-arm.tar.gz"; - hash = "sha512-OwDO/OCWK744lXcdNyem2R8gjm+IGfBeZxqkB9e0zslYUGSwHy3ujWJn2IaAhMZ5uIT5Jt19SqDBXwXX+bQt4w=="; - }; - linux-musl-arm64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-musl-arm64.tar.gz"; - hash = "sha512-A+DrkfpbPaqlCVp9RBbFGNwyPM5cQs8xaxsJT9s7gZfhjhr3XUzNUR3k66gEqjs5nUEEaAb8sep5BSPCj8BrGQ=="; - }; - linux-musl-x64 = { - url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-linux-musl-x64.tar.gz"; - hash = "sha512-DtLBHH7hyOmtRPXSgF50jwCU2jGHNi0KDKNCqnWvz9W8Gf5yOSPtvdC09nKtxFXBj8jwgaVBWZ3xbbiFXj45Jg=="; - }; osx-arm64 = { url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.115/dotnet-sdk-9.0.115-osx-arm64.tar.gz"; hash = "sha512-eU+QDeVY8w8uI3WWXAjADdSZCq0p4xv9CTsIsdmlv1fHjMbz22jNhTB2+BaJKJjEPVCOeES0BguKkR3Om8x3Xg=="; diff --git a/pkgs/development/compilers/dotnet/9.0/deps.json b/pkgs/development/compilers/dotnet/9.0/deps.json index 33c0ba6dc780..fe51488c7066 100644 --- a/pkgs/development/compilers/dotnet/9.0/deps.json +++ b/pkgs/development/compilers/dotnet/9.0/deps.json @@ -1,50 +1 @@ -[ - { - "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", - "sha256": "35e10f23c0b5b10901551c68d1abe981a0b48c8e4b86c61c3a1985458f5a81f6", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.14/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "9e721aed2a8597685c251c479bdf1838c9c014b4fa2ec26ef4e162747f97e12a", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.14/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "hash": "sha256-nfXhbwSIvFUxNs5+NV92pYj5xpge9N5ydUy8kZ5xZ6Y=", - "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.14/runtime.linux-x64.microsoft.netcore.ilasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "hash": "sha256-C/UpFPa+dNKLBn4YPCRQhyrIj4CXxL6mIjIR/vnTs3I=", - "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.14/runtime.linux-x64.microsoft.netcore.ildasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", - "sha256": "5934e0320090375e08c8bf93eac462bd06bf779b179a336eb679bf4acd5b9f6a", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.14/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "06409aff89f46a10122437e87c8a7adc1be66ab83f9544e9b3f53736c015e48f", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.14/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", - "sha256": "ba94d34897841a2fea3f64c6b6a5dc61c757c9ca08912fbd3d300e09b9a6c2f0", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.14/runtime.osx-x64.microsoft.netcore.ilasm.9.0.14.nupkg", - "version": "9.0.14" - }, - { - "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", - "sha256": "4564854526fa0e2ccb5a460c9e82beb6d4dad7ea003504cee4f4073bda350809", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.14/runtime.osx-x64.microsoft.netcore.ildasm.9.0.14.nupkg", - "version": "9.0.14" - } -] +[] diff --git a/pkgs/development/compilers/dotnet/binary/update.sh b/pkgs/development/compilers/dotnet/binary/update.sh index 63ad985e965f..b1320ac545e8 100755 --- a/pkgs/development/compilers/dotnet/binary/update.sh +++ b/pkgs/development/compilers/dotnet/binary/update.sh @@ -7,7 +7,7 @@ shopt -s inherit_errexit trap 'exit 1' ERR -rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) +rids=() release () { local content="$1" @@ -124,22 +124,25 @@ versionAtLeast () { # with every new major .NET release. aspnetcore_packages () { local version=$1 - local pkgs=( - Microsoft.AspNetCore.App.Ref - ) + local pkgs=() - if versionAtLeast "$version" 10; then - pkgs+=( - Microsoft.AspNetCore.App.Internal.Assets - ) + if [[ -z "$vmr_bootstrap" ]]; then + pkgs+=( + Microsoft.AspNetCore.App.Ref + ) + + if versionAtLeast "$version" 10; then + pkgs+=( + Microsoft.AspNetCore.App.Internal.Assets + ) + fi fi generate_package_list "$version" ' ' "${pkgs[@]}" } aspnetcore_target_packages () { - local version=$1 - local rid=$2 + local version=$1 rid=$2 local pkgs=( "Microsoft.AspNetCore.App.Runtime.$rid" ) @@ -149,23 +152,27 @@ aspnetcore_target_packages () { netcore_packages () { local version=$1 - local pkgs=( - Microsoft.NETCore.DotNetAppHost - Microsoft.NETCore.App.Ref - ) + local pkgs=() - if ! versionAtLeast "$version" 9; then + if [[ -z "$vmr_bootstrap" ]]; then pkgs+=( - Microsoft.NETCore.DotNetHost - Microsoft.NETCore.DotNetHostPolicy - Microsoft.NETCore.DotNetHostResolver + Microsoft.NETCore.DotNetAppHost + Microsoft.NETCore.App.Ref ) - fi - if versionAtLeast "$version" 7; then - pkgs+=( - Microsoft.DotNet.ILCompiler - ) + if ! versionAtLeast "$version" 9; then + pkgs+=( + Microsoft.NETCore.DotNetHost + Microsoft.NETCore.DotNetHostPolicy + Microsoft.NETCore.DotNetHostResolver + ) + fi + + if versionAtLeast "$version" 7; then + pkgs+=( + Microsoft.DotNet.ILCompiler + ) + fi fi if versionAtLeast "$version" 8; then @@ -178,65 +185,81 @@ netcore_packages () { } netcore_host_packages () { - local version=$1 - local rid=$2 + local version=$1 rid=$2 local pkgs=( "Microsoft.NETCore.App.Crossgen2.$rid" ) - local min_ilcompiler= - case "$rid" in - linux-musl-arm) ;; - linux-arm) ;; - win-x86) ;; - osx-arm64) min_ilcompiler=8 ;; - *) min_ilcompiler=7 ;; - esac + if [[ -n "$vmr_bootstrap" ]]; then + if versionAtLeast "$version" 9; then + pkgs+=( + "runtime.$rid.Microsoft.NETCore.ILAsm" + "runtime.$rid.Microsoft.NETCore.ILDAsm" + "runtime.$rid.Microsoft.DotNet.ILCompiler" + ) + fi + else + local min_ilcompiler= + case "$rid" in + linux-musl-arm) ;; + linux-arm) ;; + win-x86) ;; + osx-arm64) min_ilcompiler=8 ;; + *) min_ilcompiler=7 ;; + esac - if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then - pkgs+=( - "runtime.$rid.Microsoft.DotNet.ILCompiler" - ) + if [[ -n "$min_ilcompiler" ]] && versionAtLeast "$version" "$min_ilcompiler"; then + pkgs+=( + "runtime.$rid.Microsoft.DotNet.ILCompiler" + ) + fi fi generate_package_list "$version" ' ' "${pkgs[@]}" } netcore_target_packages () { - local version=$1 - local rid=$2 - local pkgs=( - "Microsoft.NETCore.App.Host.$rid" - "Microsoft.NETCore.App.Runtime.$rid" - "runtime.$rid.Microsoft.NETCore.DotNetAppHost" - ) + local version=$1 rid=$2 + local pkgs=() - if ! versionAtLeast "$version" 9; then + if [[ -n "$vmr_bootstrap" ]]; then pkgs+=( - "runtime.$rid.Microsoft.NETCore.DotNetHost" - "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" - "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" + "Microsoft.NETCore.App.Runtime.$rid" + ) + else + pkgs+=( + "Microsoft.NETCore.App.Host.$rid" + "Microsoft.NETCore.App.Runtime.$rid" + "runtime.$rid.Microsoft.NETCore.DotNetAppHost" ) - case "$rid" in - linux-musl-arm*) ;; - win-arm64) ;; - *) pkgs+=( - "Microsoft.NETCore.App.Runtime.Mono.$rid" - ) ;; - esac - fi - if versionAtLeast "$version" 10; then - pkgs+=( - "Microsoft.NETCore.App.Runtime.NativeAOT.$rid" - ) + if ! versionAtLeast "$version" 9; then + pkgs+=( + "runtime.$rid.Microsoft.NETCore.DotNetHost" + "runtime.$rid.Microsoft.NETCore.DotNetHostPolicy" + "runtime.$rid.Microsoft.NETCore.DotNetHostResolver" + ) + case "$rid" in + linux-musl-arm*) ;; + win-arm64) ;; + *) pkgs+=( + "Microsoft.NETCore.App.Runtime.Mono.$rid" + ) ;; + esac + fi + + if versionAtLeast "$version" 10; then + pkgs+=( + "Microsoft.NETCore.App.Runtime.NativeAOT.$rid" + ) + fi fi generate_package_list "$version" ' ' "${pkgs[@]}" } usage () { - echo "Usage: $pname [[--sdk] [-o output] sem-version] ... + echo "Usage: $pname [[--vmr-bootstrap] [--sdk] [-o output] sem-version] ... Get updated dotnet src (platform - url & sha512) expressions for specified versions Exit codes: @@ -251,8 +274,7 @@ Examples: } update() { - local -r sem_version=$1 sdk=$2 - local output=$3 + local -r sem_version=$1 local patch_specified=false # Check if a patch was specified as an argument. @@ -274,7 +296,7 @@ update() { local major_minor content major_minor_patch major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) - if [[ -n $sdk ]]; then + if [[ -n $sdk_only ]]; then trap '' ERR major_minor_patch=$( jq -er --arg version "$sem_version" ' @@ -294,7 +316,7 @@ update() { aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content") runtime_version=$(jq -er '.runtime.version' <<< "$release_content") - if [[ -n $sdk ]]; then + if [[ -n $sdk_only ]]; then sdk_versions=("$sem_version") else mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn) @@ -320,6 +342,12 @@ update() { fi fi + if [[ -n "$vmr_bootstrap" ]]; then + rids=({linux-{arm64,x64},osx-{arm64,x64}}) + else + rids=({linux-{,musl-}{arm,arm64,x64},osx-{arm64,x64},win-{arm64,x64,x86}}) + fi + local aspnetcore_files runtime_files aspnetcore_files="$(release_files "$release_content" .\"aspnetcore-runtime\")" runtime_files="$(release_files "$release_content" .runtime)" @@ -401,7 +429,7 @@ in rec { };" done - if [[ -n $sdk ]]; then + if [[ -n $sdk_only ]]; then echo " sdk = sdk_$major_minor_underscore; " @@ -419,17 +447,22 @@ in rec { } main () { - local pname sdk output + local pname pname=$(basename "$0") - sdk= + vmr_bootstrap= + sdk_only= output= while [ $# -gt 0 ]; do case $1 in + --vmr-bootstrap) + shift + vmr_bootstrap=1 + ;; --sdk) shift - sdk=1 + sdk_only=1 ;; -o) shift @@ -437,7 +470,8 @@ main () { shift ;; *) - update "$1" "$sdk" "$output" + update "$1" + output= shift ;; esac diff --git a/pkgs/development/compilers/dotnet/source/stage0.nix b/pkgs/development/compilers/dotnet/source/stage0.nix index ef08f24a024b..58af9501a8b7 100644 --- a/pkgs/development/compilers/dotnet/source/stage0.nix +++ b/pkgs/development/compilers/dotnet/source/stage0.nix @@ -66,9 +66,12 @@ let ''; postConfigure = old.postConfigure or "" + '' - [[ ! -v prebuiltPackages ]] || \ - ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ - ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ( + shopt -s nullglob + [[ ! -v prebuiltPackages ]] || \ + ln -sf "$prebuiltPackages"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ln -sf "${sdkPackages}"/share/nuget/source/*/*/*.nupkg prereqs/packages/prebuilt/ + ) ''; buildFlags = diff --git a/pkgs/development/compilers/dotnet/source/update.sh b/pkgs/development/compilers/dotnet/source/update.sh index 585f45e71f19..ea4095221f09 100755 --- a/pkgs/development/compilers/dotnet/source/update.sh +++ b/pkgs/development/compilers/dotnet/source/update.sh @@ -95,12 +95,17 @@ EOF ) fi - tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh - artifactsVersion=$(xq -r '.Project.PropertyGroup | - map(select(.PrivateSourceBuiltArtifactsVersion)) - | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) + getProperty() { + xq -er ".Project.PropertyGroup | add | .$1" "$2" + } - if [[ "$artifactsVersion" != "" ]]; then + tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh + set +e + artifactsVersion=$(getProperty PrivateSourceBuiltArtifactsVersion eng/Versions.props) + rc=$? + set -e + + if [[ $rc == 0 ]]; then artifactVar=$(grep ^defaultArtifactsRid= prep-source-build.sh) eval "$artifactVar" @@ -120,11 +125,11 @@ EOF [[ $? == 22 ]] artifactsUrl=https://ci.dot.net/public/source-build/$artifactsFile } - else - artifactsUrl=$(xq -r '.Project.PropertyGroup | - map(select(.PrivateSourceBuiltArtifactsUrl)) - | .[] | .PrivateSourceBuiltArtifactsUrl' eng/Versions.props) + elif [[ $rc == 1 ]]; then + artifactsUrl=$(getProperty PrivateSourceBuiltArtifactsUrl eng/Versions.props) artifactsUrl="${artifactsUrl/dotnetcli.azureedge.net/builds.dotnet.microsoft.com}" + else + exit $rc fi artifactsHash=$(nix-prefetch-url "$artifactsUrl") @@ -150,7 +155,7 @@ EOF if [[ $band == 1xx ]]; then getBootstrap() { pkgs/development/compilers/dotnet/binary/update.sh \ - -o "$output"/bootstrap-sdk.nix --sdk "$1" >&2 + -o "$output"/bootstrap-sdk.nix --vmr-bootstrap --sdk "$1" >&2 } getBootstrap "$sdkVersion" || if [[ $? == 2 ]]; then From b03c6ea7c0645184ba8dc5b3ee80752a27e029f7 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 8 May 2026 15:14:18 -0300 Subject: [PATCH 0183/1079] dotnet: build only source-build-reference-packages in fetch-deps This is all that's needed in practice to populate deps.json, and it's much faster. --- .../compilers/dotnet/source/stage0.nix | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dotnet/source/stage0.nix b/pkgs/development/compilers/dotnet/source/stage0.nix index 58af9501a8b7..76cc50f977e9 100644 --- a/pkgs/development/compilers/dotnet/source/stage0.nix +++ b/pkgs/development/compilers/dotnet/source/stage0.nix @@ -135,8 +135,35 @@ let -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1901' \ src/$proj/Directory.Build.props done + + # disable all the after-build targets + substituteInPlace build.proj \ + --replace-fail 'AfterTargets="Build"' "" \ + --replace-quiet '$(RepoProjectsDir)dotnet.proj' '$(RepoProjectsDir)$(RootRepo).proj' + + [[ ! -e eng/finish-source-only.proj ]] || + substituteInPlace eng/finish-source-only.proj \ + --replace-quiet 'AfterTargets="Build"' "" \ + --replace-quiet 'BeforeTargets="Build"' "" + + [[ ! -e eng/extract-sdk-archive.proj ]] || + substituteInPlace eng/extract-sdk-archive.proj \ + --replace-quiet 'BeforeTargets="AfterBuild"' "" \ + --replace-quiet 'BeforeTargets="Build"' "" + + [[ ! -e eng/PublishSourceBuild.props ]] || + substituteInPlace eng/PublishSourceBuild.props \ + --replace-fail 'AfterTargets="Publish"' "" \ + --replace-fail 'AfterTargets="DiscoverArtifacts"' "" ''; - buildFlags = [ "--online" ] ++ old.buildFlags; + buildFlags = [ + "--online" + ] + ++ old.buildFlags + ++ [ + "-p:RootRepo=source-build-reference-packages" + "-p:SkipPrepareSdkArchive=true" + ]; prebuiltPackages = null; }); From 4607ff7cef9d04d5c1011f9743bc72d56d6e490d Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sat, 7 Mar 2026 23:07:08 -0800 Subject: [PATCH 0184/1079] nixos/docker-registry: fix mkIf misuse and OCI manifest test The redis block was wrapped in lib.mkIf inside a let binding. mkIf is a module system primitive that only works inside module config definitions; in a let binding its internal {_type, condition, content} structure got serialized straight into the JSON config file. Move the redis config into services.dockerRegistry.extraConfig with mkIf, where the module system handles it correctly. Also update the test's curl accept header from application/vnd.docker.distribution.manifest.v2+json to application/vnd.oci.image.manifest.v1+json, since distribution v3 produces OCI manifests by default. --- .../modules/services/misc/docker-registry.nix | 30 ++++++++++--------- nixos/tests/docker-registry.nix | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index d6d8df3b2baf..860128aa163f 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -28,20 +28,6 @@ let }; }; - registryConfig.redis = lib.mkIf cfg.enableRedisCache { - addr = "${cfg.redisUrl}"; - password = "${cfg.redisPassword}"; - db = 0; - dialtimeout = "10ms"; - readtimeout = "10ms"; - writetimeout = "10ms"; - pool = { - maxidle = 16; - maxactive = 64; - idletimeout = "300s"; - }; - }; - configFile = cfg.configFile; in { @@ -139,6 +125,22 @@ in }; config = lib.mkIf cfg.enable { + services.dockerRegistry.extraConfig = lib.mkIf cfg.enableRedisCache { + redis = { + addr = "${cfg.redisUrl}"; + password = "${cfg.redisPassword}"; + db = 0; + dialtimeout = "10ms"; + readtimeout = "10ms"; + writetimeout = "10ms"; + pool = { + maxidle = 16; + maxactive = 64; + idletimeout = "300s"; + }; + }; + }; + systemd.services.docker-registry = { description = "Docker Container Registry"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index d30c48132d89..0599e2d978db 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -53,7 +53,7 @@ client2.succeed("docker images | grep scratch") client2.succeed( - "curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl -fsS -I -H\"Accept: application/vnd.docker.distribution.manifest.v2+json\" registry:8080/v2/scratch/manifests/latest | grep Docker-Content-Digest | sed -e 's/Docker-Content-Digest: //' | tr -d '\\r')" + "curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl -fsS -I -H\"Accept: application/vnd.oci.image.manifest.v1+json\" registry:8080/v2/scratch/manifests/latest | grep Docker-Content-Digest | sed -e 's/Docker-Content-Digest: //' | tr -d '\\r')" ) registry.systemctl("start docker-registry-garbage-collect.service") From 68e2e2bde3015a036b0dd09bbd0c20dfe64fe048 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Mon, 20 Apr 2026 12:28:52 -0700 Subject: [PATCH 0185/1079] nixos/test-driver: fix eval with noUserModules When "non-user" modules are not placed in baseModules or extraModules (arguments of eval-config.nix), noUserModules.evalModules breaks if the options defined in those modules are consumed. In order to restore noUserModules functionality for NixOS VM (and now nspawn) tests, the modules implementing test behavior are moved to baseModules. --- nixos/lib/testing/nixos-test-base.nix | 1 + nixos/lib/testing/nodes.nix | 167 +++++++++--------- .../nspawn-container/default.nix | 2 - nixos/modules/virtualisation/qemu-vm.nix | 1 - 4 files changed, 85 insertions(+), 86 deletions(-) diff --git a/nixos/lib/testing/nixos-test-base.nix b/nixos/lib/testing/nixos-test-base.nix index 6b518e39ac11..5e4fe23f3b5e 100644 --- a/nixos/lib/testing/nixos-test-base.nix +++ b/nixos/lib/testing/nixos-test-base.nix @@ -8,6 +8,7 @@ in { imports = [ ../../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs + ../../modules/virtualisation/guest-networking-options.nix { key = "no-manual"; documentation.nixos.enable = false; diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index dfd7a7278277..f83f268c88b3 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -37,93 +37,94 @@ let in hostToGuest.${hostPlatform.system} or (throw message); - baseOS = import ../eval-config.nix { - inherit lib; - system = null; # use modularly defined system - inherit (config.node) specialArgs; - modules = [ config.defaults ]; - baseModules = (import ../../modules/module-list.nix) ++ [ - ./nixos-test-base.nix - { - key = "nodes"; - _module.args = { - inherit (config) containers; - nodes = config.nodesCompat; - }; - } - ( - { options, ... }: - { - key = "nodes.nix-pkgs"; - config = optionalAttrs (!config.node.pkgsReadOnly) ( - mkIf (!options.nixpkgs.pkgs.isDefined) { - # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates. - nixpkgs.system = guestSystem; + baseOS = + extraBaseModules: + import ../eval-config.nix { + inherit lib; + system = null; # use modularly defined system + inherit (config.node) specialArgs; + modules = [ config.defaults ]; + baseModules = + (import ../../modules/module-list.nix) + ++ [ + ./nixos-test-base.nix + { + key = "nodes"; + _module.args = { + inherit (config) containers; + nodes = config.nodesCompat; + }; + } + ( + { options, ... }: + { + key = "nodes.nix-pkgs"; + config = optionalAttrs (!config.node.pkgsReadOnly) ( + mkIf (!options.nixpkgs.pkgs.isDefined) { + # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates. + nixpkgs.system = guestSystem; + } + ); } - ); - } - ) - testModuleArgs.config.extraBaseModules - ]; - }; - baseQemuOS = baseOS.extendModules { - modules = [ - ../../modules/virtualisation/qemu-vm.nix - config.nodeDefaults + ) + testModuleArgs.config.extraBaseModules + ] + ++ extraBaseModules; + }; + baseQemuOS = baseOS [ + ../../modules/virtualisation/qemu-vm.nix + testModuleArgs.config.extraBaseNodeModules + config.nodeDefaults + { + key = "base-qemu"; + virtualisation.qemu = { + inherit (testModuleArgs.config.qemu) package forceAccel; + }; + virtualisation.host.pkgs = hostPkgs; + } + ]; + baseNspawnOS = baseOS [ + ../../modules/virtualisation/nspawn-container + config.containerDefaults + ( + { pkgs, ... }: { - key = "base-qemu"; - virtualisation.qemu = { - inherit (testModuleArgs.config.qemu) package forceAccel; + key = "base-nspawn"; + + # PAM requires setuid and doesn't work in the build sandbox. + # https://github.com/NixOS/nix/blob/959c244a1265f4048390f3ad21679219d7b27a99/src/libstore/unix/build/linux-derivation-builder.cc#L63 + services.openssh.settings.UsePAM = false; + + # Networking for tests is statically configured by default. + # dhcpcd times out after blocking for a long time, which slows down tests. + # See https://github.com/NixOS/nixpkgs/pull/478109#discussion_r2867570799 + networking.useDHCP = lib.mkDefault false; + + # Disable Info manual directory generation to prevent build failures. + # + # Context: 'install-info' (from texinfo) is triggered during system-path + # generation to index manuals, but it requires 'gzip' in the $PATH to + # decompress them. + # When 'networking.useDHCP' is set to false, transitive dependencies + # (like dhcpcd or other network tools) that normally pull 'gzip' into + # the system environment are removed. This leaves 'install-info' + # stranded without 'gzip', causing the 'system-path' derivation to fail. + # Since nspawn containers are typically minimal, disabling 'info' + # is a cleaner fix than explicitly adding 'gzip' to systemPackages. + documentation.info.enable = lib.mkDefault false; + + # Gross, insecure hack to make login work. See above. + security.pam.services.login = { + text = '' + auth sufficient ${pkgs.linux-pam}/lib/security/pam_permit.so + account sufficient ${pkgs.linux-pam}/lib/security/pam_permit.so + password sufficient ${pkgs.linux-pam}/lib/security/pam_permit.so + session sufficient ${pkgs.linux-pam}/lib/security/pam_permit.so + ''; }; - virtualisation.host.pkgs = hostPkgs; } - testModuleArgs.config.extraBaseNodeModules - ]; - }; - baseNspawnOS = baseOS.extendModules { - modules = [ - ../../modules/virtualisation/nspawn-container - config.containerDefaults - ( - { pkgs, ... }: - { - key = "base-nspawn"; - - # PAM requires setuid and doesn't work in the build sandbox. - # https://github.com/NixOS/nix/blob/959c244a1265f4048390f3ad21679219d7b27a99/src/libstore/unix/build/linux-derivation-builder.cc#L63 - services.openssh.settings.UsePAM = false; - - # Networking for tests is statically configured by default. - # dhcpcd times out after blocking for a long time, which slows down tests. - # See https://github.com/NixOS/nixpkgs/pull/478109#discussion_r2867570799 - networking.useDHCP = lib.mkDefault false; - - # Disable Info manual directory generation to prevent build failures. - # - # Context: 'install-info' (from texinfo) is triggered during system-path - # generation to index manuals, but it requires 'gzip' in the $PATH to - # decompress them. - # When 'networking.useDHCP' is set to false, transitive dependencies - # (like dhcpcd or other network tools) that normally pull 'gzip' into - # the system environment are removed. This leaves 'install-info' - # stranded without 'gzip', causing the 'system-path' derivation to fail. - # Since nspawn containers are typically minimal, disabling 'info' - # is a cleaner fix than explicitly adding 'gzip' to systemPackages. - documentation.info.enable = lib.mkDefault false; - - # Gross, insecure hack to make login work. See above. - security.pam.services.login = { - text = '' - auth sufficient ${pkgs.linux-pam}/lib/security/pam_permit.so - account sufficient ${pkgs.linux-pam}/lib/security/pam_permit.so - password sufficient ${pkgs.linux-pam}/lib/security/pam_permit.so - session sufficient ${pkgs.linux-pam}/lib/security/pam_permit.so - ''; - }; - } - ) - ]; - }; + ) + ]; # TODO (lib): Dedup with run.nix, add to lib/options.nix mkOneUp = opt: f: lib.mkOverride (opt.highestPrio - 1) (f opt.value); diff --git a/nixos/modules/virtualisation/nspawn-container/default.nix b/nixos/modules/virtualisation/nspawn-container/default.nix index f56167ca0b07..e1fdab1a6f1c 100644 --- a/nixos/modules/virtualisation/nspawn-container/default.nix +++ b/nixos/modules/virtualisation/nspawn-container/default.nix @@ -21,8 +21,6 @@ let cfg = config.virtualisation; in { - imports = [ ../guest-networking-options.nix ]; - options = { virtualisation.cmdline = lib.mkOption { diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index b58cdd8ac5f7..01d0c6cca8c8 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -399,7 +399,6 @@ in imports = [ ../profiles/qemu-guest.nix ./disk-size-option.nix - ./guest-networking-options.nix (mkRenamedOptionModule [ "virtualisation" From 0485c167e750c323de274d298f28049d87009b63 Mon Sep 17 00:00:00 2001 From: mochie~! <187453775+mochienya@users.noreply.github.com> Date: Sun, 10 May 2026 01:13:26 +0200 Subject: [PATCH 0186/1079] godsvg: 1.0-alpha14 -> 1.0-alpha15 --- pkgs/by-name/go/godsvg/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/godsvg/package.nix b/pkgs/by-name/go/godsvg/package.nix index 5065e77b2684..13affaf2ac5a 100644 --- a/pkgs/by-name/go/godsvg/package.nix +++ b/pkgs/by-name/go/godsvg/package.nix @@ -5,16 +5,17 @@ lib, fetchFromGitHub, nix-update-script, + enableWayland ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "godsvg"; - version = "1.0-alpha14"; + version = "1.0-alpha15"; src = fetchFromGitHub { owner = "MewPurPur"; repo = "GodSVG"; tag = "v${finalAttrs.version}"; - hash = "sha256-Bo45Zu13RRPxf5tZhCxAulTe61o9kwqX1nEFJDaeBng="; + hash = "sha256-vEwkpYMIqiqCFVNE7UzEts/lSS9zR+AgvvSr+vj0Aas="; }; nativeBuildInputs = [ @@ -53,11 +54,15 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${godot_4_6}/bin/godot4 $out/bin/godsvg \ --add-flag "--main-pack" \ - --add-flag "$out/share/godsvg/godsvg.pck" + --add-flag "$out/share/godsvg/godsvg.pck" \ + ${lib.optionalString enableWayland '' + --add-flag "--display-driver" \ + --add-flag wayland + ''} install -Dm444 ./assets/logos/icon.svg $out/share/icons/hicolor/scalable/apps/godsvg.svg install -Dm444 ./assets/logos/icon.png $out/share/icons/hicolor/256x256/apps/godsvg.png - install -Dm444 ./assets/GodSVG.desktop $out/share/applications/GodSVG.desktop + install -Dm444 ./no_export/distribution/com.godsvg.GodSVG.desktop $out/share/applications/GodSVG.desktop runHook postInstall ''; From ea2faddf359ed1dd87771b3a54c5d1c67e6e7c62 Mon Sep 17 00:00:00 2001 From: Angel J <78835633+iamanaws@users.noreply.github.com> Date: Sat, 9 May 2026 19:18:02 -0700 Subject: [PATCH 0187/1079] t3code: 0.0.22 -> 0.0.23 --- pkgs/by-name/t3/t3code/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/t3/t3code/package.nix b/pkgs/by-name/t3/t3code/package.nix index f7780aa46890..5f0e0d74a8e7 100644 --- a/pkgs/by-name/t3/t3code/package.nix +++ b/pkgs/by-name/t3/t3code/package.nix @@ -80,13 +80,13 @@ stdenv.mkDerivation ( runHook postInstall ''; - outputHash = "sha256-zO4LNUxU0q/+kKBtRQKNTzWHnmGT4ONMRkyJem3ei/o="; + outputHash = "sha256-aHy6OpzwYLStC8LrME2dXKrz4aKPgHNL6oONRn89gjc="; outputHashMode = "recursive"; }; in { pname = "t3code"; - version = "0.0.22"; + version = "0.0.23"; strictDeps = true; __structuredAttrs = true; @@ -94,7 +94,7 @@ stdenv.mkDerivation ( owner = "pingdotgg"; repo = "t3code"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZSUmu3FT+wpCLwpUv3yrFWC4EzcVvev9cZQ/FyeLjqI="; + hash = "sha256-gsDHogGnzKVwypGwK1PzYBXpBYBFQHIbXMpWVUGzKU8="; }; postPatch = '' From d4efba67da816e374ebc236a3eeaf143e33bacf4 Mon Sep 17 00:00:00 2001 From: Angel J <78835633+iamanaws@users.noreply.github.com> Date: Sat, 9 May 2026 19:26:52 -0700 Subject: [PATCH 0188/1079] entire: 0.5.6 -> 0.6.1 --- pkgs/by-name/en/entire/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/en/entire/package.nix b/pkgs/by-name/en/entire/package.nix index 16f3db5b2db4..42649d13e343 100644 --- a/pkgs/by-name/en/entire/package.nix +++ b/pkgs/by-name/en/entire/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "entire"; - version = "0.5.6"; + version = "0.6.1"; src = fetchFromGitHub { owner = "entireio"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-bedr0HldXTQJvyXXIsbJb6hMKzqDTz6dv4x0Lwjk13E="; + hash = "sha256-VfuzYSFgH6cW80SYtkhaNeiNYFAOHbcFX9jdr/rDqSw="; }; - vendorHash = "sha256-iG8Xc6y9gJ1DawTKYSpVlY7H97lZ9OsmvaOX6r0ATXo="; + vendorHash = "sha256-GhFH/y781RIRZ7+r79Wsw8x0/ZmTnv0g9GHtESn5zSA="; subPackages = [ "cmd/entire" ]; From d73385bde6a50b91807404b2d9f279edbb94c7bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 02:35:00 +0000 Subject: [PATCH 0189/1079] unityhub: 3.16.4 -> 3.18.0 --- pkgs/by-name/un/unityhub/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unityhub/package.nix b/pkgs/by-name/un/unityhub/package.nix index 0bd5f57a54dc..029119029240 100644 --- a/pkgs/by-name/un/unityhub/package.nix +++ b/pkgs/by-name/un/unityhub/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "unityhub"; - version = "3.16.4"; + version = "3.18.0"; src = fetchurl { url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb"; - hash = "sha256-cWE3F4o/VWTewmVrd+VKaHSv84+UlADcm1kFow/pz2Q="; + hash = "sha256-JDkmF8ANvW0j5L+92prUcVFqDbUGXkxxUZPjtOqwDlk="; }; nativeBuildInputs = [ From 3ac147b5abbcb730405751f128b217c9bdac2670 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 10 May 2026 10:39:45 +0300 Subject: [PATCH 0190/1079] crossmacro: remove unused mesa dependency Builds and runs perfectly fine without it. --- pkgs/by-name/cr/crossmacro/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/cr/crossmacro/package.nix b/pkgs/by-name/cr/crossmacro/package.nix index 07856440a205..d1252016121d 100644 --- a/pkgs/by-name/cr/crossmacro/package.nix +++ b/pkgs/by-name/cr/crossmacro/package.nix @@ -18,7 +18,6 @@ libxfixes, libxtst, libglvnd, - mesa, wayland, libxkbcommon, glib, @@ -71,7 +70,6 @@ buildDotnetModule rec { libxtst glib libglvnd - mesa wayland libxkbcommon ]; From e264b7c63a6c843a6b1beaa419f462dcd1be9374 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 10 May 2026 10:42:25 +0300 Subject: [PATCH 0191/1079] playwright: remove hardcoded mesa dependency Things that rely on this should use llvmpipeHook instead. --- pkgs/development/web/playwright/webkit.nix | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/web/playwright/webkit.nix b/pkgs/development/web/playwright/webkit.nix index 5100bdfc2e02..250c815a24b0 100644 --- a/pkgs/development/web/playwright/webkit.nix +++ b/pkgs/development/web/playwright/webkit.nix @@ -41,7 +41,6 @@ libxkbcommon, libxml2_13, libxslt, - mesa, libgbm, sqlite, systemdLibs, @@ -187,16 +186,7 @@ let wrapProgram $out/minibrowser-wpe/bin/MiniBrowser \ --prefix GIO_EXTRA_MODULES ":" "${glib-networking}/lib/gio/modules/" \ - --prefix LD_LIBRARY_PATH ":" $out/minibrowser-wpe/lib \ - --run ' - # Use Mesa as EGL vendor fallback when no system EGL vendor is configured. - # libglvnd discovers vendors via JSON files https://github.com/NVIDIA/libglvnd/blob/master/src/EGL/icd_enumeration.md - if [ -z "$__EGL_VENDOR_LIBRARY_DIRS" ] && [ -z "$__EGL_VENDOR_LIBRARY_FILENAMES" ] && \ - ! [ -d /usr/share/glvnd/egl_vendor.d ] && ! [ -d /etc/glvnd/egl_vendor.d ] && \ - ! [ -d /run/opengl-driver/share/glvnd/egl_vendor.d ]; then - export __EGL_VENDOR_LIBRARY_FILENAMES="${mesa}/share/glvnd/egl_vendor.d/50_mesa.json" - fi - ' + --prefix LD_LIBRARY_PATH ":" $out/minibrowser-wpe/lib ''; }; webkit-darwin = fetchzip { From 5bb24db2a734bffa6cbcf04364fc01bca6256c9f Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 10 May 2026 10:42:54 +0300 Subject: [PATCH 0192/1079] tdarr: remove unused mesa dependency Builds and runs fine without it. --- pkgs/tools/misc/tdarr/common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/misc/tdarr/common.nix b/pkgs/tools/misc/tdarr/common.nix index 499e642b4c95..790a8520e061 100644 --- a/pkgs/tools/misc/tdarr/common.nix +++ b/pkgs/tools/misc/tdarr/common.nix @@ -14,7 +14,6 @@ libayatana-appindicator, wayland, libxkbcommon, - mesa, libxcb, leptonica, glib, @@ -122,7 +121,6 @@ stdenv.mkDerivation (finalAttrs: { wayland libxkbcommon libxcb - mesa tesseract4 leptonica glib From 0c816328ae81637f36051e2da3733e24d389f41f Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 10 May 2026 10:44:20 +0300 Subject: [PATCH 0193/1079] zoom-us: remove mesa dependency and questionable test The NixOS test covers the same use case, but has a correctly set up, actually-graphical environment without the limitations of xvfb-run. --- nixos/tests/zoom-us.nix | 2 ++ pkgs/by-name/zo/zoom-us/package.nix | 2 -- pkgs/by-name/zo/zoom-us/test.nix | 44 ----------------------------- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 pkgs/by-name/zo/zoom-us/test.nix diff --git a/nixos/tests/zoom-us.nix b/nixos/tests/zoom-us.nix index bc9961cf5a86..a8a6a3f2f9ea 100644 --- a/nixos/tests/zoom-us.nix +++ b/nixos/tests/zoom-us.nix @@ -14,5 +14,7 @@ machine.wait_for_x() machine.execute("zoom >&2 &") machine.wait_for_window("Zoom Workplace") + machine.sleep(20) + machine.wait_for_window("Zoom Workplace") ''; } diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix index d811819729b7..916792aec826 100644 --- a/pkgs/by-name/zo/zoom-us/package.nix +++ b/pkgs/by-name/zo/zoom-us/package.nix @@ -135,7 +135,6 @@ let dontPatchELF = true; passthru.updateScript = ./update.sh; - passthru.tests.startwindow = callPackage ./test.nix { }; passthru.tests.nixos-module = nixosTests.zoom-us; meta = { @@ -179,7 +178,6 @@ let pkgs.libxi pkgs.libxkbcommon pkgs.libxslt - pkgs.mesa pkgs.mesa-demos pkgs.nspr pkgs.nss diff --git a/pkgs/by-name/zo/zoom-us/test.nix b/pkgs/by-name/zo/zoom-us/test.nix deleted file mode 100644 index 57cc2047312f..000000000000 --- a/pkgs/by-name/zo/zoom-us/test.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - xvfb-run, - zoom-us, - runCommand, - writeShellApplication, - xwininfo, -}: - -let - testScript = writeShellApplication { - name = "zoom-us-test-script"; - runtimeInputs = [ - xwininfo - zoom-us - ]; - text = '' - function is_zoom_window_present { - echo - xwininfo -root -tree \ - | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \ - | tee window-names - grep -q "Zoom Workplace" window-names - } - # Don't let zoom eat all RAM, like it did, cf. - # https://github.com/NixOS/nixpkgs/issues/371488 - prlimit --{as,data}=$((4*2**30)):$((4*2**30)) zoom-us & - for _ in {0..900} ; do - if is_zoom_window_present ; then - break - fi - sleep 1 - done - # If libraries are missing, the window still appears, - # but then disappears again immediately; check for that also. - sleep 20 - is_zoom_window_present - ''; - }; -in -runCommand "zoom-us-test" { buildInputs = [ xvfb-run ]; } '' - HOME=$PWD xvfb-run ${lib.getExe testScript} - touch ${placeholder "out"} -'' From 22e73ceb2bd340a745ab156ce820a4cbd634eb43 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Sun, 10 May 2026 08:29:46 +0000 Subject: [PATCH 0194/1079] hullcaster: 0.2.0 -> 0.3.0 --- pkgs/by-name/hu/hullcaster/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hu/hullcaster/package.nix b/pkgs/by-name/hu/hullcaster/package.nix index fdba0bec43e5..c03739e53c6b 100644 --- a/pkgs/by-name/hu/hullcaster/package.nix +++ b/pkgs/by-name/hu/hullcaster/package.nix @@ -6,25 +6,27 @@ openssl, pkg-config, rustPlatform, + sqlite, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hullcaster"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "gilcu3"; repo = "hullcaster"; tag = "v${finalAttrs.version}"; - hash = "sha256-BR3klwy6vm6nJ38sgS/PGPQ19n0GJq6eQE97lHmg+kQ="; + hash = "sha256-O3MBvadayZ6hryexPX/VN1NUZpHTg/JZATJRIOBgZCg="; }; - cargoHash = "sha256-TZmRObtkwrHRy/I6hhacbHUWiajKDLnHafLWIwVM15o="; + cargoHash = "sha256-/2prlOy3h+TtACJ9Oa7f9kYiaFGjFhoS8dO26w0fTrk="; buildInputs = [ alsa-lib dbus openssl + sqlite ]; nativeBuildInputs = [ @@ -34,6 +36,8 @@ rustPlatform.buildRustPackage (finalAttrs: { # work around error: Could not create filepath: /homeless-shelter/.local/share checkFlags = [ "--skip=gpodder::tests::gpodder" + "--skip=config::tests" + "--skip=gpodder::tests" ]; meta = { From d5dcdfc6505df996bf66eb2ef05c291ea9a790a8 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 8 May 2026 16:02:35 -0600 Subject: [PATCH 0195/1079] kicad{,-small}: 10.0.1 -> 10.0.2 Diff: https://gitlab.com/kicad/code/kicad/-/compare/10.0.1...10.0.2 --- pkgs/by-name/ki/kicad/versions.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ki/kicad/versions.nix b/pkgs/by-name/ki/kicad/versions.nix index 890806ae81b4..ca851d687f70 100644 --- a/pkgs/by-name/ki/kicad/versions.nix +++ b/pkgs/by-name/ki/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "10.0.1"; + version = "10.0.2"; src = { - rev = "65c045085a7c2da92e839d00ed14d3f2a447654c"; - sha256 = "1mnlv8fyz03pfg8pkqwdl5gjz6vsk98c6414lf3wkvrkb85ljaav"; + rev = "94c02dfc4a778a094cd8ad7b1d2348a96f024123"; + sha256 = "0bk86javsfm1mwlksnv8p7pws5ii3zag6aah13gn5zlc31z295yh"; }; }; libVersion = { - version = "10.0.1"; + version = "10.0.2"; libSources = { - symbols.rev = "49f3091e7fea8d9b935635f3328cbf07b7548625"; - symbols.sha256 = "0iz4lb33wdsw4f82a0ln8ycgaf39gjws03mvl2j1q9npwj6xl1cm"; - templates.rev = "66727540677590f988f8448fd3b632d3f26cc1b4"; + symbols.rev = "f31042c9759771f10754f02e54344dee750692b1"; + symbols.sha256 = "05h8dbygch2kp4s5ikspxngwv999j7jwsiwm4pzwwcrir7dqzdfl"; + templates.rev = "db5a3e2a99d5200cabfb03199fe28a5f3ba59191"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "ab2f97eaa2ab7769ec3ad0487ff9bcafabe8641a"; - footprints.sha256 = "0jqgyi1yb2zc6w56ba7xama0wnhrqwbbnf2fqvr47xihvdcvs87v"; - packages3d.rev = "efef8c6631221341db2549c52b921e33dd05bbb4"; - packages3d.sha256 = "0jr70ry6inzc2fy3s300z0zlmihbq95ba1zckyd1wwbpplaj1gbl"; + footprints.rev = "c076368c29f8f5c3ad2ee7ed91083815b79ddb72"; + footprints.sha256 = "1h1v44qc5lvvqvmi1i7b79jhxsfq8snk0mcfl6r73hj6w0b25l84"; + packages3d.rev = "3720ad929a99187fc55a8d35895672ef9aaf9cb7"; + packages3d.sha256 = "01nbjcs3890hyfmafc623ldmfi9n8sjr5m0wripz5fq5fjdnzqxl"; }; }; }; From 293eaac5f98ade11a1f9034cd2bb67e91c752c10 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Fri, 8 May 2026 16:18:47 -0600 Subject: [PATCH 0196/1079] kicad-unstable{,-small}: 2025-02-21 -> 2026-05-08 --- pkgs/by-name/ki/kicad/versions.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ki/kicad/versions.nix b/pkgs/by-name/ki/kicad/versions.nix index ca851d687f70..55ecccb5e360 100644 --- a/pkgs/by-name/ki/kicad/versions.nix +++ b/pkgs/by-name/ki/kicad/versions.nix @@ -47,23 +47,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2025-02-21"; + version = "2026-05-08"; src = { - rev = "878cf768d6552131494aa792dc20e6ccf67baf75"; - sha256 = "0ky0a7y6gf409y8bwpngiirqin4ivbcjnk8gjdj1a6w79x559sr8"; + rev = "76f8839fd232594f81180f644e3370c390025144"; + sha256 = "0nbr3cmrz1ca4rcwbfxvlrnwxy091lscgsqd92pqyy9sjcvqdfjg"; }; }; libVersion = { - version = "2025-02-21"; + version = "2026-05-08"; libSources = { - symbols.rev = "da86acd48809fd61876223c8bf0e4e7793c52e9a"; - symbols.sha256 = "1sdpg58wbyyrghjd0jqw5iw2094mjy2v9jmwn5zrj4jm6f51g1kd"; + symbols.rev = "5a41d2112853c72129a9128df01021278c1aec11"; + symbols.sha256 = "05h8dbygch2kp4s5ikspxngwv999j7jwsiwm4pzwwcrir7dqzdfl"; templates.rev = "3ed4538b0f965d821df63a5fffc4441e723cfe7f"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "e515f1c3213317d436e492c8c06620ef4caca84e"; - footprints.sha256 = "16zslgvjg4swgkkvnd9fmiks3wzg63364d03hixiyzcpjlgk2bbk"; - packages3d.rev = "d5db5cea003fe2b4b1c9b145f5fcbd5fdb48f8ca"; - packages3d.sha256 = "0bg54lg1iw01gw06ajg34y7x4y36wm6ls3jnpjy13i18d4ik77g4"; + footprints.rev = "098da23b916d287a0c7913752df53e6bfdf640a2"; + footprints.sha256 = "1h1v44qc5lvvqvmi1i7b79jhxsfq8snk0mcfl6r73hj6w0b25l84"; + packages3d.rev = "394aeaa41d7be7f717715d9ba004d7d0d8b74b36"; + packages3d.sha256 = "01nbjcs3890hyfmafc623ldmfi9n8sjr5m0wripz5fq5fjdnzqxl"; }; }; }; From 495ba1ae1e875070eec81479fd8bb65acee49ee3 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 17:41:01 +0700 Subject: [PATCH 0197/1079] python3Packages.pycyphal: fix doctests on python 3.14 --- pkgs/development/python-modules/pycyphal/default.nix | 4 ++++ .../pycyphal/python-3.14-asyncio-loop.patch | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/python-modules/pycyphal/python-3.14-asyncio-loop.patch diff --git a/pkgs/development/python-modules/pycyphal/default.nix b/pkgs/development/python-modules/pycyphal/default.nix index 787f04c413c9..8fed197d2e4d 100644 --- a/pkgs/development/python-modules/pycyphal/default.nix +++ b/pkgs/development/python-modules/pycyphal/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build system setuptools, @@ -34,6 +35,9 @@ buildPythonPackage rec { fetchSubmodules = true; }; + # Set an event loop in the doctest helper; policy.get_event_loop no longer auto-creates one on 3.14. + patches = lib.optional (pythonAtLeast "3.14") ./python-3.14-asyncio-loop.patch; + build-system = [ setuptools ]; pythonRelaxDeps = [ "numpy" ]; diff --git a/pkgs/development/python-modules/pycyphal/python-3.14-asyncio-loop.patch b/pkgs/development/python-modules/pycyphal/python-3.14-asyncio-loop.patch new file mode 100644 index 000000000000..9bd4cb5b47e0 --- /dev/null +++ b/pkgs/development/python-modules/pycyphal/python-3.14-asyncio-loop.patch @@ -0,0 +1,10 @@ +--- a/tests/__init__.py ++++ b/tests/__init__.py +@@ -37,6 +37,7 @@ + This function shall be invoked per test, because the test suite undoes its effect before starting the next test. + """ + _logger.info("asyncio_allow_event_loop_access_from_top_level()") ++ asyncio.set_event_loop(asyncio.new_event_loop()) + + def swap(mod: Any, name: str, new: Any) -> None: + restore = _PATCH_RESTORE_PREFIX + name From e102ddf32933bcc4ec8f644d0670a6e77e2cd6aa Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 10 May 2026 13:49:41 +0300 Subject: [PATCH 0198/1079] screentest: fix changelog --- pkgs/by-name/sc/screentest/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/screentest/package.nix b/pkgs/by-name/sc/screentest/package.nix index 65c02d3e569a..9ce8f7afa841 100644 --- a/pkgs/by-name/sc/screentest/package.nix +++ b/pkgs/by-name/sc/screentest/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple screen testing tool"; mainProgram = "screentest"; homepage = "https://github.com/TobiX/screentest"; - changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.version}/NEWS"; + changelog = "https://github.com/TobiX/screentest/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl2Only; maintainers = [ ]; platforms = lib.platforms.unix; From 602cb6356c4a869a260126da4466c8a78b8d52b2 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 10 May 2026 13:52:06 +0300 Subject: [PATCH 0199/1079] syncstorage-rs: fix changelog --- pkgs/by-name/sy/syncstorage-rs/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix index d177af7c8a82..ae0684f2a674 100644 --- a/pkgs/by-name/sy/syncstorage-rs/package.nix +++ b/pkgs/by-name/sy/syncstorage-rs/package.nix @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Mozilla Sync Storage built with Rust"; homepage = "https://github.com/mozilla-services/syncstorage-rs"; - changelog = "https://github.com/mozilla-services/syncstorage-rs/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/mozilla-services/syncstorage-rs/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mpl20; maintainers = [ ]; platforms = lib.platforms.linux; From 0bcea65e13ad06eddc7d21fae2d7d7337a1014af Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 10 May 2026 13:55:13 +0300 Subject: [PATCH 0200/1079] vscode-extensions.tekumara.typos-vscode: fix changelog --- .../vscode/extensions/tekumara.typos-vscode/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 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 38a30b4e57e9..6d5b83c7e2d6 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -31,7 +31,7 @@ let } .${system} or (throw "Unsupported system: ${system}"); in -vscode-utils.buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "typos-vscode"; publisher = "tekumara"; @@ -57,7 +57,7 @@ vscode-utils.buildVscodeMarketplaceExtension { passthru.updateScript = vscode-extension-update-script { }; meta = { - changelog = "https://marketplace.visualstudio.com/items/tekumara.typos-vscode/changelog"; + changelog = "https://github.com/tekumara/typos-lsp/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "VSCode extension for providing a low false-positive source code spell checker"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=tekumara.typos-vscode"; homepage = "https://github.com/tekumara/typos-lsp"; @@ -70,4 +70,4 @@ vscode-utils.buildVscodeMarketplaceExtension { ]; maintainers = [ ]; }; -} +}) From be79ab6c782504ebab6c6a286e8a4ca9ff21eb71 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 5 May 2026 23:53:38 +0800 Subject: [PATCH 0201/1079] mate-utils: 1.28.0 -> 1.28.1 https://github.com/mate-desktop/mate-utils/compare/v1.28.0...v1.28.1 --- pkgs/by-name/ma/mate-utils/package.nix | 31 ++++++++++++++++++++------ 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ma/mate-utils/package.nix b/pkgs/by-name/ma/mate-utils/package.nix index 1dd76a649967..53a4f62c9cdc 100644 --- a/pkgs/by-name/ma/mate-utils/package.nix +++ b/pkgs/by-name/ma/mate-utils/package.nix @@ -1,9 +1,12 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, pkg-config, + autoconf-archive, + autoreconfHook, gettext, + gtk-doc, itstool, glib, gtk-layer-shell, @@ -13,33 +16,43 @@ libcanberra-gtk3, inkscape, udisks, + mate-common, mate-desktop, mate-panel, hicolor-icon-theme, wayland, wrapGAppsHook3, + yelp-tools, gitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "mate-utils"; - version = "1.28.0"; + version = "1.28.1"; outputs = [ "out" "man" ]; - src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor finalAttrs.version}/mate-utils-${finalAttrs.version}.tar.xz"; - sha256 = "WESdeg0dkA/wO3jKn36Ywh6X9H/Ca+5/8cYYNPIviNM="; + src = fetchFromGitHub { + owner = "mate-desktop"; + repo = "mate-utils"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-0G25g4vpfufbvUYjCRJVBv9r5t/gnkDzWGKTf8N5MFQ="; }; nativeBuildInputs = [ + autoconf-archive + autoreconfHook pkg-config gettext + gtk-doc itstool inkscape + mate-common # mate-common.m4 macros wrapGAppsHook3 + yelp-tools ]; buildInputs = [ @@ -58,9 +71,14 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Workaround undefined version requirements # https://github.com/mate-desktop/mate-utils/issues/361 - substituteInPlace configure \ + substituteInPlace configure.ac \ --replace-fail '>= $GTK_LAYER_SHELL_REQUIRED_VERSION' "" \ --replace-fail '>= $GDK_WAYLAND_REQUIRED_VERSION' "" + + # Do not build gsearchtool help translations + # https://github.com/mate-desktop/mate-utils/issues/210 + substituteInPlace gsearchtool/help/Makefile.am \ + --replace 'if USE_NLS' 'if FALSE' ''; configureFlags = [ "--enable-wayland" ]; @@ -70,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; passthru.updateScript = gitUpdater { - url = "https://git.mate-desktop.org/mate-utils"; odd-unstable = true; rev-prefix = "v"; }; From 510fcb16c800f25a1b303363ca78d9130474ad4b Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 10 May 2026 14:34:36 +0300 Subject: [PATCH 0202/1079] uppy-companion: fix changelog --- pkgs/by-name/up/uppy-companion/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/up/uppy-companion/package.nix b/pkgs/by-name/up/uppy-companion/package.nix index c31a93e57995..30dea050c6e0 100644 --- a/pkgs/by-name/up/uppy-companion/package.nix +++ b/pkgs/by-name/up/uppy-companion/package.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { broken = stdenv.hostPlatform.isDarwin; - changelog = "https://github.com/transloadit/uppy/releases/tag/%2540uppy%252Fcompanion%2540${finalAttrs.version}"; + changelog = "https://github.com/transloadit/uppy/releases/tag/%40uppy%2Fcompanion%40${finalAttrs.version}"; description = "Server integration for Uppy file uploader"; homepage = "https://uppy.io/"; license = lib.licenses.mit; From d5276b19bbbe5e9ff03f73bf8d184c0c39e91971 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 10 May 2026 14:35:37 +0300 Subject: [PATCH 0203/1079] webpack-cli: fix changelog --- pkgs/by-name/we/webpack-cli/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/we/webpack-cli/package.nix b/pkgs/by-name/we/webpack-cli/package.nix index 0f309ffbe9c8..b4b565a6f583 100644 --- a/pkgs/by-name/we/webpack-cli/package.nix +++ b/pkgs/by-name/we/webpack-cli/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - changelog = "https://github.com/webpack/webpack-cli/blob/webpack-cli%2540${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/webpack/webpack-cli/blob/webpack-cli%40${finalAttrs.version}/CHANGELOG.md"; description = "Webpack's Command Line Interface"; homepage = "https://webpack.js.org/api/cli/"; license = lib.licenses.mit; From 238609999d3cc9927fc8dcc8b4a2ed77a698627d Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 10 May 2026 14:37:17 +0300 Subject: [PATCH 0204/1079] wgnord: remove changelog no changelog or release notes present --- pkgs/by-name/wg/wgnord/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/wg/wgnord/package.nix b/pkgs/by-name/wg/wgnord/package.nix index 8cfada43b3e5..2fb2857fa04e 100644 --- a/pkgs/by-name/wg/wgnord/package.nix +++ b/pkgs/by-name/wg/wgnord/package.nix @@ -59,7 +59,6 @@ resholve.mkDerivation rec { meta = { description = "NordVPN Wireguard (NordLynx) client in POSIX shell"; homepage = "https://github.com/phirecc/wgnord"; - changelog = "https://github.com/phirecc/wgnord/releases/tag/v${version}"; maintainers = [ ]; license = lib.licenses.mit; mainProgram = "wgnord"; From f48c4348207b9d1922590326ad4b745f213e62e7 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Sun, 10 May 2026 14:44:20 +0300 Subject: [PATCH 0205/1079] zsh-powerlevel10k: remove changelog versions after 1.20 are not tagged and not logged anywhere --- pkgs/by-name/zs/zsh-powerlevel10k/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix index cbc33168774e..d1b7c03b4623 100644 --- a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix +++ b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - changelog = "https://github.com/romkatv/powerlevel10k/releases/tag/v${finalAttrs.version}"; description = "Fast reimplementation of Powerlevel9k ZSH theme"; longDescription = '' To make use of this derivation, use From 8407ffe708bfd9a83e6bbd0e8caf74559cd3a110 Mon Sep 17 00:00:00 2001 From: Fazzi Date: Sat, 9 May 2026 15:44:04 +0100 Subject: [PATCH 0206/1079] still: init at 0.0.9 --- pkgs/by-name/st/still/package.nix | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/st/still/package.nix diff --git a/pkgs/by-name/st/still/package.nix b/pkgs/by-name/st/still/package.nix new file mode 100644 index 000000000000..f0459249b1d0 --- /dev/null +++ b/pkgs/by-name/st/still/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + meson, + ninja, + pkg-config, + scdoc, + wayland, + wayland-protocols, + pixman, + wayland-scanner, + nix-update-script, + fetchFromGitHub, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "still"; + version = "0.0.9"; + + src = fetchFromGitHub { + owner = "faergeek"; + repo = "still"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bZo4SvBB5pSdvwxuE3+A2iz1um1kSZQ62chR0lOjpj8="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + wayland-scanner + ]; + + buildInputs = [ + pixman + wayland + wayland-protocols + ]; + + strictDeps = true; + __structuredAttrs = true; + + postInstall = '' + install -Dm644 $src/LICENSE $out/share/licenses/still/LICENSE + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Freeze the screen of a Wayland compositor until a provided command exits"; + homepage = "https://github.com/faergeek/still"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + mainProgram = "still"; + maintainers = [ lib.maintainers.fazzi ]; + }; +}) From bc816ad215adad12c2f96cdd720c7232e6f14998 Mon Sep 17 00:00:00 2001 From: 2kybe3 Date: Fri, 8 May 2026 19:59:33 +0200 Subject: [PATCH 0207/1079] managarr: 0.7.1 -> 0.7.2 Diff: https://github.com/Dark-Alex-17/managarr/compare/v0.7.1...v0.7.2 Changelog: https://github.com/Dark-Alex-17/managarr/releases/tag/v0.7.2 --- pkgs/by-name/ma/managarr/package.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ma/managarr/package.nix b/pkgs/by-name/ma/managarr/package.nix index fe3098c039ee..f5af6e545ce2 100644 --- a/pkgs/by-name/ma/managarr/package.nix +++ b/pkgs/by-name/ma/managarr/package.nix @@ -3,31 +3,39 @@ fetchFromGitHub, rustPlatform, perl, + cacert, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "managarr"; - version = "0.7.1"; + version = "0.7.2"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "Dark-Alex-17"; repo = "managarr"; tag = "v${finalAttrs.version}"; - hash = "sha256-bKW67cpLbnBxF5gbpwfCNe2QkxKYvooWEM3yKrbj7Q8="; + hash = "sha256-10wM6OI3XqFQKyspJU6fqnE3GyzxNaquQlPjn3nS774="; }; - cargoHash = "sha256-CDhFj7lP65wlLkSWGcQ8YBK4umSyQsBGF/Sn85gy5hE="; + cargoHash = "sha256-7myysFoBYTosHPZ3gzSzXhN8+wbHHF/73b6wQqdlKe8="; nativeBuildInputs = [ perl ]; + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + + __darwinAllowLocalNetworking = true; + meta = { description = "TUI and CLI to manage your Servarrs"; homepage = "https://github.com/Dark-Alex-17/managarr"; license = lib.licenses.mit; - maintainers = [ - lib.maintainers.IncredibleLaser - lib.maintainers.darkalex - lib.maintainers.nindouja + maintainers = with lib.maintainers; [ + IncredibleLaser + darkalex + nindouja + kybe236 ]; mainProgram = "managarr"; }; From 2756bdc91150f55247daaf246d6b3a38d3ebc5ce Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 20:07:42 +0700 Subject: [PATCH 0208/1079] python3Packages.mlrose: disable broken test --- pkgs/development/python-modules/mlrose/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/mlrose/default.nix b/pkgs/development/python-modules/mlrose/default.nix index 9a75d4bb162d..0ec60de6f4d8 100644 --- a/pkgs/development/python-modules/mlrose/default.nix +++ b/pkgs/development/python-modules/mlrose/default.nix @@ -47,6 +47,11 @@ buildPythonPackage rec { # Fix random seed during tests pytestFlags = [ "--randomly-seed=0" ]; + disabledTests = [ + # mimic optimizer fails to converge under current numpy + "test_mimic_discrete_max_fast" + ]; + meta = { description = "Machine Learning, Randomized Optimization and SEarch"; homepage = "https://github.com/gkhayes/mlrose"; From b232930fbbb8d5087b10946f478bace099bf6d79 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 20:14:16 +0700 Subject: [PATCH 0209/1079] python3Packages.migen: fix build with python 3.14 --- pkgs/development/python-modules/migen/default.nix | 5 +++++ .../development/python-modules/migen/tracer-3.14.patch | 10 ++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/python-modules/migen/tracer-3.14.patch diff --git a/pkgs/development/python-modules/migen/default.nix b/pkgs/development/python-modules/migen/default.nix index 2df88bddfa45..6b797342da91 100644 --- a/pkgs/development/python-modules/migen/default.nix +++ b/pkgs/development/python-modules/migen/default.nix @@ -20,6 +20,11 @@ buildPythonPackage { hash = "sha256-gRAvl5cUvrjq4t7htXsDBt4F8MEbHXFZoS0jbhrEs1I="; }; + patches = [ + # Add LOAD_FAST_BORROW to opcode tracer for python 3.14. + ./tracer-3.14.patch + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ colorama ]; diff --git a/pkgs/development/python-modules/migen/tracer-3.14.patch b/pkgs/development/python-modules/migen/tracer-3.14.patch new file mode 100644 index 000000000000..6b6f25184bbd --- /dev/null +++ b/pkgs/development/python-modules/migen/tracer-3.14.patch @@ -0,0 +1,10 @@ +--- a/migen/fhdl/tracer.py ++++ b/migen/fhdl/tracer.py +@@ -38,6 +38,7 @@ _load_build_opcodes = { + "BUILD_LIST" : _bytecode_length_version_guard(3), + "CACHE" : _bytecode_length_version_guard(3), + "COPY" : _bytecode_length_version_guard(3), ++ "LOAD_FAST_BORROW" : _bytecode_length_version_guard(3), + } + + From 722ad843a4ca5a3bdb8ec86d0a172c150acc9655 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 20:26:00 +0700 Subject: [PATCH 0210/1079] python3Packages.mdtraj: disable more network tests --- pkgs/development/python-modules/mdtraj/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mdtraj/default.nix b/pkgs/development/python-modules/mdtraj/default.nix index d4632b852af6..16cbb0e1fb2c 100644 --- a/pkgs/development/python-modules/mdtraj/default.nix +++ b/pkgs/development/python-modules/mdtraj/default.nix @@ -84,8 +84,10 @@ buildPythonPackage rec { disabledTests = [ # require network access - "test_pdb_from_url" + "test_load_pdb_from_url" + "test_load_from_url" "test_1vii_url_and_gz" + "test_1vii_load_from_mixture" "test_3" # fail due to data race From 3256d9da561c88dc191a54b7fdf673964f9d7876 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 21:00:33 +0700 Subject: [PATCH 0211/1079] python3Packages.mahotas: skip refcount tests on python 3.14 --- pkgs/development/python-modules/mahotas/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 9d0aa801707e..033e06da1f7a 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -2,6 +2,7 @@ buildPythonPackage, fetchFromGitHub, pillow, + pythonAtLeast, scipy, numpy, pytestCheckHook, @@ -45,6 +46,11 @@ buildPythonPackage rec { "test_ellipse_axes" "test_normalize" "test_haralick3d" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # sys.getrefcount semantics changed in 3.14 + "test_close_holes_simple" + "test_watershed" ]; pythonImportsCheck = [ "mahotas" ]; From 7f678e17331886c8887b9705184882a2e608634a Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Sun, 10 May 2026 14:11:34 +0000 Subject: [PATCH 0212/1079] polyphone: 2.4.1 -> 2.5.1 --- pkgs/by-name/po/polyphone/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/polyphone/package.nix b/pkgs/by-name/po/polyphone/package.nix index a352dbad23dc..a451f30b3208 100644 --- a/pkgs/by-name/po/polyphone/package.nix +++ b/pkgs/by-name/po/polyphone/package.nix @@ -8,19 +8,20 @@ libjack2, libogg, libvorbis, + libsndfile, rtmidi, kdePackages, }: stdenv.mkDerivation (finalAttrs: { - version = "2.4.1"; + version = "2.5.1"; pname = "polyphone"; src = fetchFromGitHub { owner = "davy7125"; repo = "polyphone"; tag = finalAttrs.version; - hash = "sha256-43EswCgNJv11Ov+4vmj2vS/yJ2atyzkRmk/SoCKYD/0="; + hash = "sha256-zs8fdHC1/bR2m05+SEmsMPyxATE/KHcAj57DNYt63rQ="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { libjack2 libogg libvorbis + libsndfile kdePackages.qtsvg kdePackages.qtwayland rtmidi From f62620fa3d60c9d9af2626f9f96194c661027b56 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Sat, 9 May 2026 09:54:55 +0000 Subject: [PATCH 0213/1079] tirith: 0.2.12 -> 0.3.1 --- pkgs/by-name/ti/tirith/package.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ti/tirith/package.nix b/pkgs/by-name/ti/tirith/package.nix index 728ffd343add..3f9bd107e3fa 100644 --- a/pkgs/by-name/ti/tirith/package.nix +++ b/pkgs/by-name/ti/tirith/package.nix @@ -8,21 +8,26 @@ }: rustPlatform.buildRustPackage (final: { pname = "tirith"; - version = "0.2.12"; + version = "0.3.1"; src = fetchFromGitHub { owner = "sheeki03"; repo = "tirith"; tag = "v${final.version}"; - hash = "sha256-O0IRWiNib7sc6y17NdHcFfxKW5M37l/87kBEAJiTMWs="; + hash = "sha256-RdStW5ubqypdmFqNk9DHtUp5jHnZdXiWW/lAlSaBb3c="; }; - cargoHash = "sha256-mIQ1zvAh+a7EyyNoYEZFdYUaQ9drIE2WfHmFHvgFUFM="; + cargoHash = "sha256-/V2vv02x0zSsJCcJMSttG9eekRZMK7KTk6m2VYePFa8="; cargoBuildFlags = [ "-p" "tirith" ]; + postPatch = '' + # The bash_preexec_enforce tests require a shell with job control + rm crates/tirith/tests/bash_preexec_enforce.rs + ''; + checkFlags = [ # requires a fully functional shell environment, generating init scripts needs a patch under nix to work at build time "--skip=init_bash_output" @@ -34,6 +39,7 @@ rustPlatform.buildRustPackage (final: { ]; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; + __darwinAllowLocalNetworking = true; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd tirith \ From 1310cc9b79d840316d93850586ae5cd24ea01612 Mon Sep 17 00:00:00 2001 From: Angel J <78835633+Iamanaws@users.noreply.github.com> Date: Sun, 10 May 2026 09:56:51 -0700 Subject: [PATCH 0214/1079] t3code: use Bun hoisted linker for node_modules FOD --- pkgs/by-name/t3/t3code/package.nix | 32 ++++++++++-------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/t3/t3code/package.nix b/pkgs/by-name/t3/t3code/package.nix index 5f0e0d74a8e7..6cc12078453c 100644 --- a/pkgs/by-name/t3/t3code/package.nix +++ b/pkgs/by-name/t3/t3code/package.nix @@ -43,29 +43,20 @@ stdenv.mkDerivation ( dontConfigure = true; dontFixup = true; - postPatch = '' - substituteInPlace package.json \ - --replace-fail '"prepare": "effect-language-service patch",' '"prepare": "true",' - ''; - buildPhase = '' runHook preBuild + # Use hoisted linker: Bun's default/isolated layout can race and omit + # cyclic peer dependency bin links (e.g. update-browserslist-db → + # browserslist). A manual .bin/browserslist symlink under .bun did not + # reliably fix builds; see https://github.com/oven-sh/bun/pull/29014. bun install \ + --linker=hoisted \ --cpu="*" \ --ignore-scripts \ --no-progress \ --frozen-lockfile \ - --os="linux" \ - --os="darwin" - - # Work around to prevent a Bun race that can omit this cyclic peer dependency bin link. - # See https://github.com/oven-sh/bun/pull/29014. - for updateBrowserslistDbBinDir in node_modules/.bun/update-browserslist-db@*/node_modules/.bin; do - if [ -d "$updateBrowserslistDbBinDir" ] && [ ! -e "$updateBrowserslistDbBinDir/browserslist" ]; then - ln -s ../browserslist/cli.js "$updateBrowserslistDbBinDir/browserslist" - fi - done + --os="*" runHook postBuild ''; @@ -75,12 +66,11 @@ stdenv.mkDerivation ( mkdir --parents $out cp --recursive node_modules $out - find apps packages -type d -name node_modules -exec cp --recursive --parents {} $out \; runHook postInstall ''; - outputHash = "sha256-aHy6OpzwYLStC8LrME2dXKrz4aKPgHNL6oONRn89gjc="; + outputHash = "sha256-63Vx05VLHiZpY1K8ZS1GyoupU4i3sEPEAnWMWyMelbg="; outputHashMode = "recursive"; }; in @@ -128,9 +118,9 @@ stdenv.mkDerivation ( chmod --recursive u+rwX node_modules patchShebangs node_modules - # Compile node-pty's native addon from the vendored bun store. + # Compile node-pty's native addon (hoisted into node_modules). export npm_config_nodedir=${nodejs} - cd node_modules/.bun/node-pty@*/node_modules/node-pty + cd node_modules/node-pty node-gyp rebuild node scripts/post-install.js cd - @@ -162,8 +152,8 @@ stdenv.mkDerivation ( mkdir --parents "$out"/libexec/t3code/apps/desktop "$out"/libexec/t3code/apps/server cp --recursive --no-preserve=mode node_modules "$out"/libexec/t3code - cp --recursive --no-preserve=mode apps/server/{node_modules,dist} "$out"/libexec/t3code/apps/server - cp --recursive --no-preserve=mode apps/desktop/{node_modules,dist-electron} "$out"/libexec/t3code/apps/desktop + cp --recursive --no-preserve=mode apps/server/dist "$out"/libexec/t3code/apps/server + cp --recursive --no-preserve=mode apps/desktop/dist-electron "$out"/libexec/t3code/apps/desktop mkdir --parents "$out"/libexec/t3code/apps/desktop/prod-resources install --mode=444 ${desktopIcon} \ From 62d38ee3ac36ec99660562a5ad76d219e1253ec5 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 10 May 2026 20:52:43 +0200 Subject: [PATCH 0215/1079] ssh-tpm-agent: install man pages --- pkgs/by-name/ss/ssh-tpm-agent/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ss/ssh-tpm-agent/package.nix b/pkgs/by-name/ss/ssh-tpm-agent/package.nix index a7fe43b561b4..b6892641a216 100644 --- a/pkgs/by-name/ss/ssh-tpm-agent/package.nix +++ b/pkgs/by-name/ss/ssh-tpm-agent/package.nix @@ -3,6 +3,8 @@ buildGoModule, fetchFromGitHub, nix-update-script, + installShellFiles, + asciidoctor, openssh, openssl, }: @@ -22,13 +24,14 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-N7JuMUy5Z+HVhxsqESlBkHcHVipRYM8ncx/wR77k1fw="; - buildInputs = [ - openssl + nativeBuildInputs = [ + installShellFiles + asciidoctor ]; - nativeCheckInputs = [ - openssh - ]; + buildInputs = [ openssl ]; + + nativeCheckInputs = [ openssh ]; # disable broken tests, see https://github.com/NixOS/nixpkgs/pull/394097 preCheck = '' @@ -37,6 +40,11 @@ buildGoModule (finalAttrs: { substituteInPlace internal/keyring/threadkeyring_test.go --replace-fail ENOKEY ENOENT ''; + postInstall = '' + make man + installManPage man/*.1 + ''; + passthru.updateScript = nix-update-script { }; meta = { From fa3bf1b024a944529d6358abbdc19239ddee3c71 Mon Sep 17 00:00:00 2001 From: Defelo Date: Sun, 10 May 2026 20:44:33 +0200 Subject: [PATCH 0216/1079] ssh-tpm-agent: add defelo as maintainer --- pkgs/by-name/ss/ssh-tpm-agent/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ss/ssh-tpm-agent/package.nix b/pkgs/by-name/ss/ssh-tpm-agent/package.nix index b6892641a216..8e88198279e8 100644 --- a/pkgs/by-name/ss/ssh-tpm-agent/package.nix +++ b/pkgs/by-name/ss/ssh-tpm-agent/package.nix @@ -53,7 +53,10 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/Foxboron/ssh-tpm-agent/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ sgo ]; + maintainers = with lib.maintainers; [ + sgo + defelo + ]; mainProgram = "ssh-tpm-agent"; }; }) From 6e0564c9db806074214374a15f8dbd9263f61c51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 20:36:29 +0000 Subject: [PATCH 0217/1079] clouddrive2: 1.0.6 -> 1.0.7 --- pkgs/by-name/cl/clouddrive2/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 50b6fdf2886d..60a4bc653de2 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-MFZIJIcDPnNcgMWqHsnb2fSjfHySvOwq5PNyLcyCeYE="; - aarch64-linux = "sha256-Zh1MwZjYTWxGn9qWrDjTPwj+6uQ8m2FkwGlalaarGHg="; - x86_64-darwin = "sha256-quwflRL3YYc+gK4I6g7o853tbow/LRwxx0L7IXU3ijM="; - aarch64-darwin = "sha256-ebp15M1pWci+tvYtH1lp7syqNrj6ku4558TJSdaLf3I="; + x86_64-linux = "sha256-wVbCEluFyanoMy1wir87ahRdop7C4lILIn2jB5B29+M="; + aarch64-linux = "sha256-HzFg9LXdYO1bGpah5pg/xmv+/7cuVCnNsrin28Yc/OQ="; + x86_64-darwin = "sha256-Uqo6hVan4+F3DPxoHjIg53wDV9naT9h6+EiEkCJBb7o="; + aarch64-darwin = "sha256-jzCZeGq0fDnsCTGSNG0nOBGIUDBAn/D/TD2Iz5K8O3w="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; From 016bf0a32cd00ddd9ad23c160f58f920d61f6347 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Sun, 10 May 2026 20:38:52 +0000 Subject: [PATCH 0218/1079] pgmoneta: 0.19.1 -> 0.21.0 --- pkgs/by-name/pg/pgmoneta/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index 631743cd187c..30e55c476711 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -11,8 +11,11 @@ libev, libgccjit, libssh, + libyaml, lz4, + ncurses, openssl, + pkg-config, systemd, zlib, zstd, @@ -20,18 +23,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "pgmoneta"; - version = "0.19.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = finalAttrs.version; - hash = "sha256-qsKjUFCuxKSc7klB/S2N3TG+jqnS4NW0RZC6e9JQXtA="; + hash = "sha256-55oXnyNLwhtT3s4qTEh24N08vf0zhNUDVoxrUiYkVZc="; }; nativeBuildInputs = [ cmake docutils # for rst2man + pkg-config ]; buildInputs = [ @@ -42,7 +46,9 @@ stdenv.mkDerivation (finalAttrs: { libev libgccjit libssh + libyaml lz4 + ncurses openssl systemd zlib From eaa2fd12c04b43b1c0e5255c1c033f4ca25b09a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 20:52:43 +0000 Subject: [PATCH 0219/1079] microsoft-edge: 147.0.3912.98 -> 148.0.3967.54 --- pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++-- pkgs/by-name/ms/msedgedriver/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 25532cf8274a..f396929480ef 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -170,11 +170,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "147.0.3912.98"; + version = "148.0.3967.54"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-GD5bXeEWVQHr+u+B3SUjoNCJIp9hwyCW6sYMDbGUBls="; + hash = "sha256-ccMYxwaQ70p+za3LoM0vT+lXiRIlYmoldVDqsHT7I9o="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index 6616d4d9c29a..8b23b859cc72 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "msedgedriver"; - version = "147.0.3912.98"; + version = "148.0.3967.54"; src = fetchzip { url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip"; - hash = "sha256-w9ekySBlqy0ev3OE/G05UJ6tz8EGC2Pc3fMNpmvmKMU="; + hash = "sha256-woGkky1i9so+1D61irtJYjDQ0xoHUeGQsJi/eQ4VGhU="; stripRoot = false; }; From 193552e62890d4e4ca24bac0f97e2757a0e36841 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 May 2026 22:54:17 +0200 Subject: [PATCH 0220/1079] ggshield: 1.45.0 -> 1.50.4 https://github.com/GitGuardian/ggshield/releases/tag/v1.50.4 --- pkgs/by-name/gg/ggshield/package.nix | 33 +++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gg/ggshield/package.nix b/pkgs/by-name/gg/ggshield/package.nix index 37cfa29dbd9e..a7b8562d06d4 100644 --- a/pkgs/by-name/gg/ggshield/package.nix +++ b/pkgs/by-name/gg/ggshield/package.nix @@ -5,28 +5,48 @@ python3, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +let + py = python3.override { + packageOverrides = self: super: { + + # Doesn't support latest marshmallow + marshmallow = super.marshmallow.overridePythonAttrs (oldAttrs: rec { + version = "3.26.2"; + src = fetchFromGitHub { + owner = "marshmallow-code"; + repo = "marshmallow"; + tag = version; + hash = "sha256-ioe+aZHOW8r3wF3UknbTjAP0dEggd/NL9PTkPVQ46zM="; + }; + }); + }; + }; +in + +py.pkgs.buildPythonApplication (finalAttrs: { pname = "ggshield"; - version = "1.45.0"; + version = "1.50.4"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; tag = "v${finalAttrs.version}"; - hash = "sha256-9UjdAnDcUxs/2pdhnJYncw2NBPiLpxUL5T74qbX5AcY="; + hash = "sha256-wwGj7i1GoxNzdfUhcL7mulgQAPtz5WhbT67hgbcMxpo="; }; pythonRelaxDeps = true; - build-system = with python3.pkgs; [ pdm-backend ]; + build-system = with py.pkgs; [ hatchling ]; - dependencies = with python3.pkgs; [ + dependencies = with py.pkgs; [ charset-normalizer click cryptography + keyring marshmallow marshmallow-dataclass + notify-py oauthlib platformdirs pygitguardian @@ -35,6 +55,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pyyaml requests rich + sigstore truststore typing-extensions urllib3 @@ -43,7 +64,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { nativeCheckInputs = [ git ] - ++ (with python3.pkgs; [ + ++ (with py.pkgs; [ jsonschema pyfakefs pytest-factoryboy From c2e5f1e31b9c1e009cfcc060c252b488ec70f8a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 May 2026 22:56:18 +0200 Subject: [PATCH 0221/1079] python3Packages.pygitguardian: mark as broken for marshmallow >= 4 See https://github.com/GitGuardian/py-gitguardian/issues/167 --- pkgs/development/python-modules/pygitguardian/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index b45c1ac58d24..64d46ce9d32f 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.28.0"; + version = "1.30.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "py-gitguardian"; tag = "v${version}"; - hash = "sha256-56Z0peJcjBbNX51MLLaIKcD9Qg+5q+5I0gKRu84/8TM="; + hash = "sha256-8kKTqthpkH3A5secb8TqbM+/twA77R81y80MOPNQZPA="; }; pythonRelaxDeps = [ @@ -56,5 +56,7 @@ buildPythonPackage rec { changelog = "https://github.com/GitGuardian/py-gitguardian/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; + # https://github.com/GitGuardian/py-gitguardian/issues/167 + broken = lib.versionAtLeast marshmallow.version "4"; }; } From 25bf9511fc789178afe017499f8fde680809384f Mon Sep 17 00:00:00 2001 From: macbucheron1 Date: Sat, 25 Apr 2026 19:53:54 +0200 Subject: [PATCH 0222/1079] python3Packages.realtime: 3.0.0a1-> 2.29.0 --- pkgs/development/python-modules/realtime/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/realtime/default.nix b/pkgs/development/python-modules/realtime/default.nix index 34ac3f9bafb5..88f95f1a4f2b 100644 --- a/pkgs/development/python-modules/realtime/default.nix +++ b/pkgs/development/python-modules/realtime/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "realtime"; - version = "3.0.0a1"; + version = "2.29.0"; pyproject = true; src = fetchFromGitHub { owner = "supabase"; repo = "supabase-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-Pvu2zyRKS99/KEIWwQXBR7Moegt0KITiaMWi5mi+CL4="; + hash = "sha256-LaSlAYFvx/HHdfmc9J+KScVQ9JFGS98Yfihzn8F7t3g="; }; sourceRoot = "${finalAttrs.src.name}/src/realtime"; @@ -57,6 +57,9 @@ buildPythonPackage (finalAttrs: { homepage = "https://github.com/supabase/supabase-py"; changelog = "https://github.com/supabase/supabase-py/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ siegema ]; + maintainers = with lib.maintainers; [ + siegema + macbucheron + ]; }; }) From 526b687dc7e0b3a55df938b4cd3970100a8be2bf Mon Sep 17 00:00:00 2001 From: macbucheron1 Date: Sat, 25 Apr 2026 19:54:24 +0200 Subject: [PATCH 0223/1079] python3Packages.postgrest: 2.28.3 -> 2.29.0 --- .../python-modules/postgrest/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/postgrest/default.nix b/pkgs/development/python-modules/postgrest/default.nix index 8d73316e36dc..94a735648f14 100644 --- a/pkgs/development/python-modules/postgrest/default.nix +++ b/pkgs/development/python-modules/postgrest/default.nix @@ -14,19 +14,19 @@ unasync, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "postgrest"; - version = "2.28.3"; + version = "2.29.0"; pyproject = true; src = fetchFromGitHub { owner = "supabase"; repo = "supabase-py"; - tag = "v${version}"; - hash = "sha256-Ra7Ig9IMWouMIadx6mg/pe8GlgLCavR6OsPjqgySTCw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LaSlAYFvx/HHdfmc9J+KScVQ9JFGS98Yfihzn8F7t3g="; }; - sourceRoot = "${src.name}/src/postgrest"; + sourceRoot = "${finalAttrs.src.name}/src/postgrest"; build-system = [ uv-build ]; @@ -61,8 +61,8 @@ buildPythonPackage rec { meta = { description = "Client library for Supabase Functions"; homepage = "https://github.com/supabase/supabase-py"; - changelog = "https://github.com/supabase/supabase-py/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/supabase/supabase-py/blob/v${finalAttrs.src.tag}/CHANGELOG.md"; maintainers = with lib.maintainers; [ macbucheron ]; license = lib.licenses.mit; }; -} +}) From 9619804f5d360755321beea01a765f12618dd5b5 Mon Sep 17 00:00:00 2001 From: macbucheron1 Date: Sat, 25 Apr 2026 19:59:40 +0200 Subject: [PATCH 0224/1079] python3Packages.storage3: 2.28.3 -> 2.29.0 --- .../python-modules/storage3/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/storage3/default.nix b/pkgs/development/python-modules/storage3/default.nix index 97d6ba899034..e901fe0a5379 100644 --- a/pkgs/development/python-modules/storage3/default.nix +++ b/pkgs/development/python-modules/storage3/default.nix @@ -14,19 +14,19 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "storage3"; - version = "2.28.3"; + version = "2.29.0"; pyproject = true; src = fetchFromGitHub { owner = "supabase"; repo = "supabase-py"; - tag = "v${version}"; - hash = "sha256-Ra7Ig9IMWouMIadx6mg/pe8GlgLCavR6OsPjqgySTCw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LaSlAYFvx/HHdfmc9J+KScVQ9JFGS98Yfihzn8F7t3g="; }; - sourceRoot = "${src.name}/src/storage"; + sourceRoot = "${finalAttrs.src.name}/src/storage"; build-system = [ uv-build ]; @@ -61,8 +61,11 @@ buildPythonPackage rec { meta = { description = "Client library for Supabase Functions"; homepage = "https://github.com/supabase/supabase-py"; - changelog = "https://github.com/supabase/supabase-py/blob/${src.tag}/CHANGELOG.md"; - maintainers = with lib.maintainers; [ siegema ]; + changelog = "https://github.com/supabase/supabase-py/blob/v${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + siegema + macbucheron + ]; }; -} +}) From 4d84aa0ab5cbd0f2350e091db88e1917cf6fcf63 Mon Sep 17 00:00:00 2001 From: macbucheron1 Date: Sat, 25 Apr 2026 20:02:23 +0200 Subject: [PATCH 0225/1079] python3Packages.supabase-auth: 2.28.3 -> 2.29.0 --- .../python-modules/supabase-auth/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/supabase-auth/default.nix b/pkgs/development/python-modules/supabase-auth/default.nix index 9d09abc88313..bc576b2b9a49 100644 --- a/pkgs/development/python-modules/supabase-auth/default.nix +++ b/pkgs/development/python-modules/supabase-auth/default.nix @@ -12,19 +12,19 @@ pytest-mock, pytest-asyncio, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "supabase-auth"; - version = "2.28.3"; + version = "2.29.0"; pyproject = true; src = fetchFromGitHub { owner = "supabase"; repo = "supabase-py"; - tag = "v${version}"; - hash = "sha256-Ra7Ig9IMWouMIadx6mg/pe8GlgLCavR6OsPjqgySTCw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LaSlAYFvx/HHdfmc9J+KScVQ9JFGS98Yfihzn8F7t3g="; }; - sourceRoot = "${src.name}/src/auth"; + sourceRoot = "${finalAttrs.src.name}/src/auth"; build-system = [ uv-build ]; @@ -59,8 +59,8 @@ buildPythonPackage rec { meta = { description = "Client library for Supabase Auth"; homepage = "https://github.com/supabase/supabase-py/"; - changelog = "https://github.com/supabase/supabase-py/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/supabase/supabase-py/blob/v${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ macbucheron ]; }; -} +}) From caa8c1af71bc7ce495ca5052183b500d1b25d25c Mon Sep 17 00:00:00 2001 From: macbucheron1 Date: Sat, 25 Apr 2026 20:04:45 +0200 Subject: [PATCH 0226/1079] python3Packages.supabase-functions: 2.28.3 -> 2.29.0 --- .../python-modules/supabase-functions/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/supabase-functions/default.nix b/pkgs/development/python-modules/supabase-functions/default.nix index 5b64f658a45a..36738f53e2c2 100644 --- a/pkgs/development/python-modules/supabase-functions/default.nix +++ b/pkgs/development/python-modules/supabase-functions/default.nix @@ -11,19 +11,19 @@ yarl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "supabase-functions"; - version = "2.28.3"; + version = "2.29.0"; pyproject = true; src = fetchFromGitHub { owner = "supabase"; repo = "supabase-py"; - tag = "v${version}"; - hash = "sha256-Ra7Ig9IMWouMIadx6mg/pe8GlgLCavR6OsPjqgySTCw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LaSlAYFvx/HHdfmc9J+KScVQ9JFGS98Yfihzn8F7t3g="; }; - sourceRoot = "${src.name}/src/functions"; + sourceRoot = "${finalAttrs.src.name}/src/functions"; build-system = [ uv-build ]; @@ -53,8 +53,8 @@ buildPythonPackage rec { meta = { description = "Client library for Supabase Functions"; homepage = "https://github.com/supabase/supabase-py"; - changelog = "https://github.com/supabase/supabase-py/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/supabase/supabase-py/blob/v${finalAttrs.src.tag}/CHANGELOG.md"; maintainers = with lib.maintainers; [ macbucheron ]; license = lib.licenses.mit; }; -} +}) From 1fe9bbb9f66eebabfa12bdf04a95ef0c4ffff86a Mon Sep 17 00:00:00 2001 From: macbucheron1 Date: Sat, 25 Apr 2026 20:07:51 +0200 Subject: [PATCH 0227/1079] python3Packages.supabase: 2.28.3 -> 2.29.0 --- .../python-modules/supabase/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/supabase/default.nix b/pkgs/development/python-modules/supabase/default.nix index 22ba8f3fa260..ea14a847e07d 100644 --- a/pkgs/development/python-modules/supabase/default.nix +++ b/pkgs/development/python-modules/supabase/default.nix @@ -16,19 +16,19 @@ pytest-cov-stub, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "supabase"; - version = "2.28.3"; + version = "2.29.0"; pyproject = true; src = fetchFromGitHub { owner = "supabase"; repo = "supabase-py"; - tag = "v${version}"; - hash = "sha256-Ra7Ig9IMWouMIadx6mg/pe8GlgLCavR6OsPjqgySTCw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LaSlAYFvx/HHdfmc9J+KScVQ9JFGS98Yfihzn8F7t3g="; }; - sourceRoot = "${src.name}/src/supabase"; + sourceRoot = "${finalAttrs.src.name}/src/supabase"; build-system = [ uv-build ]; @@ -61,7 +61,11 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/supabase/supabase-py"; license = lib.licenses.mit; + changelog = "https://github.com/supabase/supabase-py/blob/v${finalAttrs.src.tag}/CHANGELOG.md"; description = "Supabas client for Python"; - maintainers = with lib.maintainers; [ siegema ]; + maintainers = with lib.maintainers; [ + siegema + macbucheron + ]; }; -} +}) From 41fdf7ce38078aab48d15e9b9834c2b0636b37d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 21:43:08 +0000 Subject: [PATCH 0228/1079] llmfit: 0.9.18 -> 0.9.23 --- pkgs/by-name/ll/llmfit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ll/llmfit/package.nix b/pkgs/by-name/ll/llmfit/package.nix index 32aac6b8f44c..fba0dec40493 100644 --- a/pkgs/by-name/ll/llmfit/package.nix +++ b/pkgs/by-name/ll/llmfit/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "llmfit"; - version = "0.9.18"; + version = "0.9.23"; src = fetchFromGitHub { owner = "AlexsJones"; repo = "llmfit"; tag = "v${finalAttrs.version}"; - hash = "sha256-0NswrJNA6IPqL5RaZyVyMc4p6UI7ZiWnjlnyTC4nW6o="; + hash = "sha256-KtmXNlKPz4W2hfLa1iTPUVrocEjXWfTcoMwcznV4ZEk="; }; - cargoHash = "sha256-pI3n53GSyM/HDyZ4frFzDENthupmCMC2aQOERVBMUJ4="; + cargoHash = "sha256-fx9/LVZrbwfGL03Xv53q4FaC6obKadZWesj4SfMvG78="; meta = { description = "TUI to find LLM models right sized for the system's RAM, CPU, and GPU"; From ac6ba99378a0943d5d0b21ad16859b6373092677 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Tue, 7 Oct 2025 16:13:15 -0400 Subject: [PATCH 0229/1079] windowtolayer: 0-unstable-2025-01-26 -> 0.3.1 --- pkgs/by-name/wi/windowtolayer/package.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wi/windowtolayer/package.nix b/pkgs/by-name/wi/windowtolayer/package.nix index 7de4aaf37d20..fc83ce2f9d39 100644 --- a/pkgs/by-name/wi/windowtolayer/package.nix +++ b/pkgs/by-name/wi/windowtolayer/package.nix @@ -3,37 +3,36 @@ rustPlatform, fetchFromGitLab, python3, - unstableGitUpdater, rustfmt, + nix-update-script, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "windowtolayer"; - version = "0-unstable-2025-01-26"; + version = "0.3.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "windowtolayer"; - rev = "5ddb3a2834c834af4ec412bb2ba2c77431953d51"; - hash = "sha256-PzKx8lkWDJGVj1Azc/vfbSPYV7x5+ZnCGMAAK4o207Y="; + tag = "v${version}"; + hash = "sha256-TUet9DqLMsY34Mb9t4IKr3Z/JxrPgvufzanHI4D9dZg="; }; - cargoHash = "sha256-XuSlbBLWUkPsA0DYC4qemvAGyynkkuznA5FGBKRmNso="; + cargoHash = "sha256-MqcutNzorDeYoGKWFbCzIrNuo1w2vwnGEFOuooZwPgk="; nativeBuildInputs = [ python3 rustfmt ]; - passthru.updateScript = unstableGitUpdater { - url = "https://gitlab.freedesktop.org/mstoeckl/windowtolayer.git"; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Display existing Wayland applications as a wallpaper instead"; homepage = "https://gitlab.freedesktop.org/mstoeckl/windowtolayer"; mainProgram = "windowtolayer"; license = lib.licenses.gpl3Plus; + platforms = with lib.platforms; linux ++ freebsd; maintainers = with lib.maintainers; [ anomalocaris ]; }; } From fa9faf1976f76f68d33bf08fecfd9e6ccc678ab7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 23:47:33 +0000 Subject: [PATCH 0230/1079] sub-store-frontend: 2.16.79 -> 2.16.97 --- pkgs/by-name/su/sub-store-frontend/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix index 3de1b23a1b9e..20f18168572b 100644 --- a/pkgs/by-name/su/sub-store-frontend/package.nix +++ b/pkgs/by-name/su/sub-store-frontend/package.nix @@ -13,13 +13,13 @@ buildNpmPackage (finalAttrs: { pname = "sub-store-frontend"; - version = "2.16.79"; + version = "2.16.97"; src = fetchFromGitHub { owner = "sub-store-org"; repo = "Sub-Store-Front-End"; tag = finalAttrs.version; - hash = "sha256-CwLvnxR6MSX+ZwogXEgQHny+IsH4sZrItChXWho3ZP8="; + hash = "sha256-gxHchDo6lt1h1/ywmJHQ7eqzn/17DhPZ3sKRiadv5bQ="; }; nativeBuildInputs = [ From ecc8202f3bc16354ec87f0abbc3358b60c228375 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 May 2026 23:53:11 +0000 Subject: [PATCH 0231/1079] sub-store: 2.22.15 -> 2.22.26 --- pkgs/by-name/su/sub-store/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix index 8b7b2580f12a..8a45fb42d8d2 100644 --- a/pkgs/by-name/su/sub-store/package.nix +++ b/pkgs/by-name/su/sub-store/package.nix @@ -15,13 +15,13 @@ buildNpmPackage (finalAttrs: { pname = "sub-store"; - version = "2.22.15"; + version = "2.22.26"; src = fetchFromGitHub { owner = "sub-store-org"; repo = "Sub-Store"; tag = finalAttrs.version; - hash = "sha256-bgqIJagIdP9NJAcfGxoAVgKEWiR2t+gu1QWDiCfCPjE="; + hash = "sha256-EDYPDLB4oKAcArim9xIeyH4ijrRa4tTa2elfDaOpBfk="; }; sourceRoot = "${finalAttrs.src.name}/backend"; From e1df9ee652fb5d1186863ac21c7393b37fbc4cf0 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Sun, 10 May 2026 16:56:57 -0700 Subject: [PATCH 0232/1079] perseus: fix build with gcc15 --- pkgs/by-name/pe/perseus/fix-gcc15.patch | 57 +++++++++++++++++++++++++ pkgs/by-name/pe/perseus/package.nix | 5 +++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/by-name/pe/perseus/fix-gcc15.patch diff --git a/pkgs/by-name/pe/perseus/fix-gcc15.patch b/pkgs/by-name/pe/perseus/fix-gcc15.patch new file mode 100644 index 000000000000..58289cd6a062 --- /dev/null +++ b/pkgs/by-name/pe/perseus/fix-gcc15.patch @@ -0,0 +1,57 @@ +diff --git a/Cells/Point.h b/Cells/Point.h +index b03113c..472372e 100644 +--- a/Cells/Point.h ++++ b/Cells/Point.h +@@ -91,7 +91,7 @@ public: + template + struct ptcomp + { +- bool operator ()(Point* p, Point* q) ++ bool operator ()(Point* p, Point* q) const + { + if (p == q) return false; + if (p == NULL && q != NULL) return true; +@@ -106,7 +106,7 @@ struct ptcomp + template + struct ptcomplex + { +- bool operator ()(Point* p, Point* q) ++ bool operator ()(Point* p, Point* q) const + { + if (p == q) return false; + if (p == NULL && q != NULL) return true; +diff --git a/Complexes/CToplex.h b/Complexes/CToplex.h +index bdd026f..732701e 100644 +--- a/Complexes/CToplex.h ++++ b/Complexes/CToplex.h +@@ -24,7 +24,7 @@ + // vector lexico comparison for map-making + struct addcomp + { +- bool operator () (vector* v1, vector* v2) ++ bool operator () (vector* v1, vector* v2) const + { + //cout<<" here "; cin.get(); + if (v1 == v2) return false; +diff --git a/Global/Combinatorics.h b/Global/Combinatorics.h +index d751a04..d8cf6b2 100644 +--- a/Global/Combinatorics.h ++++ b/Global/Combinatorics.h +@@ -18,7 +18,7 @@ + // order nums increasingly + struct incnum + { +- bool operator() (num n1, num n2) ++ bool operator() (num n1, num n2) const + { + return (n1 < n2); + } +@@ -28,7 +28,7 @@ struct incnum + // order nums decreasingly + struct decnum + { +- bool operator() (num n1, num n2) ++ bool operator() (num n1, num n2) const + { + return (n1 > n2); + } diff --git a/pkgs/by-name/pe/perseus/package.nix b/pkgs/by-name/pe/perseus/package.nix index 27bb58ec764e..08f7e562c039 100644 --- a/pkgs/by-name/pe/perseus/package.nix +++ b/pkgs/by-name/pe/perseus/package.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation { }; sourceRoot = "."; + + patches = [ + ./fix-gcc15.patch + ]; + env.NIX_CFLAGS_COMPILE = toString [ "-std=c++14" ]; buildPhase = '' g++ Pers.cpp -O3 -fpermissive -o perseus From 5aba43dd9cebff78a20738b1dc72f88fffc40000 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 00:01:16 +0000 Subject: [PATCH 0233/1079] python3Packages.chalice: 1.32.0 -> 1.33.0 --- pkgs/development/python-modules/chalice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 9ff94a41d8ef..dab8b5c075fb 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -25,7 +25,7 @@ buildPythonPackage (finalAttrs: { pname = "chalice"; - version = "1.32.0"; + version = "1.33.0"; pyproject = true; disabled = pythonAtLeast "3.14"; @@ -34,7 +34,7 @@ buildPythonPackage (finalAttrs: { owner = "aws"; repo = "chalice"; tag = finalAttrs.version; - hash = "sha256-7qmE78aFfq9XCl2zcx1dAVKZZb96Bu47tSW1Qp2vFl4="; + hash = "sha256-c5xzgrxRFRlvgMnf/L8rhG7rYJLtuMvDZHYsPaHkdRs="; }; build-system = [ setuptools ]; From 59c787b3416986726d0142a52771d744ca0a7f80 Mon Sep 17 00:00:00 2001 From: Rine Amakawa Date: Mon, 11 May 2026 09:21:19 +0800 Subject: [PATCH 0234/1079] freerouting: 2.2.2 -> 2.2.3 Diff: https://github.com/freerouting/freerouting/compare/v2.2.2...v2.2.3 Changelog: https://github.com/freerouting/freerouting/releases/tag/v2.2.3 --- pkgs/by-name/fr/freerouting/deps.json | 1208 ++++++++++++----------- pkgs/by-name/fr/freerouting/package.nix | 7 +- 2 files changed, 612 insertions(+), 603 deletions(-) diff --git a/pkgs/by-name/fr/freerouting/deps.json b/pkgs/by-name/fr/freerouting/deps.json index 979592b5f606..59cf5e710014 100644 --- a/pkgs/by-name/fr/freerouting/deps.json +++ b/pkgs/by-name/fr/freerouting/deps.json @@ -37,13 +37,13 @@ "module": "sha256-lQhXXODePA1p+l+xrTWo2/iQKuoQVe/E0328FjyHMmc=", "pom": "sha256-d0glMskp8EZGF/iXUT/CJNeuMlFeNIKaPO3F5WlH59s=" }, - "com/github/ben-manes#gradle-versions-plugin/0.53.0": { - "jar": "sha256-fystvdI5f/PwQ9e2YuwNYbqr7TqqerImB6702Y7z+mI=", - "module": "sha256-KLvVxzKZ1dGYcjzX8klS4b9RQJXE6OrpsisVQaicEII=", - "pom": "sha256-aPVU+CLT1aKhQrA6XZ9Wa5FXdPtjnYwds7zfmTyeQI0=" + "com/github/ben-manes#gradle-versions-plugin/0.54.0": { + "jar": "sha256-GwK15/qy3AUq4vlHU+5tsezaQoE/dXGycpqURbROpdU=", + "module": "sha256-2WoCXAumonbmVKE4UxXPExZ9CN+2uQuwSQo5RTUvmsg=", + "pom": "sha256-WX6mffXE8mkYP1y+WZAa2cBuExeLVZHNII2bMwQZ2J8=" }, - "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.53.0": { - "pom": "sha256-yWBPdJaskfaW5HRY2KLWt91U0MqkNn88GspmphyDcvQ=" + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.54.0": { + "pom": "sha256-o07zaR8ZggeMe8ef2fuJojK3xzxFpYuBEVH+m/dgb+I=" }, "com/google/code/gson#gson-parent/2.10.1": { "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" @@ -92,28 +92,40 @@ "pom": "sha256-SiFwxOx95EbWQ6yuwF/ruLxSwM0PX+rZ9Ib3VRGS0R0=" }, "com/squareup/moshi#moshi-kotlin/1.12.0": { - "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" }, + "com/squareup/moshi#moshi-kotlin/1.15.2": { + "jar": "sha256-XDnNd+g7ERr5xUcIFzr5aon9OwnRUBmhHaNV6D6X11o=", + "module": "sha256-6ddoeYIDBJSDyuIM4wDO3/Ibu0NL7zjH+R7mqi8DTDE=", + "pom": "sha256-q2sPPkQKRQndlAu6HCZlj+tGqHaZxtZSZ+n/lsnRsDA=" + }, "com/squareup/moshi#moshi/1.15.2": { "jar": "sha256-dn91ksbGHraTVJom0zPBIfU4OCa9KHuJmGeqMm2uVeQ=", "module": "sha256-2VLG3ZGntCbD8KUe3D986zSQrAH/GDAVJ63+x6eDfdk=", "pom": "sha256-MXodP7cFQDG/6QzKibECSQH9m5/MqZFmws54U7X8e9k=" }, + "com/squareup/okhttp3#okhttp-jvm/5.1.0": { + "jar": "sha256-pqrH8V08LDy9Kvfs9W+XQHFkpgSy24eVKZUOMc6mmbI=", + "module": "sha256-sulz7WEYTDMNpU5+YuW6STQLZkh1x8PiLfjvSWB8TXA=", + "pom": "sha256-aNCp1oSYz/jQM+gJUKihDamZiE6Y07RMiNDpsAUd4nA=" + }, "com/squareup/okhttp3#okhttp/4.12.0": { - "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" }, - "com/squareup/okio#okio-jvm/3.7.0": { - "jar": "sha256-2LNa3Ch2j0OuWv5qfRqiqHi6UeC5ak8wiBHzsfWxPlU=", - "module": "sha256-b64CAbCuSKGWBt4Ab/6YQtjQ/CoeQ04Hhc7Ni3Wr5HQ=", - "pom": "sha256-d07LnSsHlLT7J+eeCHYMpWC39U+qlRm5GDxn/rRfLJc=" + "com/squareup/okhttp3#okhttp/5.1.0": { + "module": "sha256-9Lg+E7Rr8Q9cccDL82M54X4ttXZwDaNElfulX063g24=", + "pom": "sha256-hwO2W8qKgsj6H3DHt4FTtAx5FrKQUS/PmA5/IaZQpzc=" }, - "com/squareup/okio#okio/3.6.0": { - "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", - "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + "com/squareup/okio#okio-jvm/3.15.0": { + "jar": "sha256-SD3Dg7EEnSIIkjIqDWpDCEJfCbsFtIxD1Oqp/4KxzRY=", + "module": "sha256-mJRUqUrvvClwMoiPE1rNoUqf+0aWDn2EYDkl0mkkHuc=", + "pom": "sha256-B45C9oykYT/yWX+8VUHFzleM3MSIOdqJ2nynYFGL+3k=" + }, + "com/squareup/okio#okio/3.15.0": { + "module": "sha256-EWgmBmzrTTM2p05xcqM3UWF+w0S8UKNPmbDSSVmko50=", + "pom": "sha256-LXN4VBFATurDLwRzouB6sVFrmFCpKAzGGgi0eXkMzPg=" }, "com/squareup/okio#okio/3.7.0": { "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=", @@ -138,23 +150,18 @@ "jar": "sha256-Vj3ED1sX9OIVT6QaFq5/QMxJARvFQAsIcOuvYaR7nCI=", "pom": "sha256-75Gy9XGcmybCOqVFwhjriwuar411/SQENmVQb7m0Gck=" }, - "com/vanniktech#central-portal/0.33.0": { - "jar": "sha256-1Q/3Fkos7tQHL4AdLkPt1yNecIlA/U9gQU3j4+rWxt0=", - "module": "sha256-xKqdybl38V3aZtwnb3DqULycNthXcuW+ImjSIekBwgM=", - "pom": "sha256-lkRgk+bAqT8VdIBdoqXU3G+Ymr6h9PLqqYSC4XtWZnw=" + "com/vanniktech#central-portal/0.36.0": { + "jar": "sha256-cNofh00Z8B5YtwU09UOd5foXGOK3FpRKgdv9zVGilug=", + "module": "sha256-RC1Dhx+ci130DeTZC15WTVa21SlW2K94i3RHfd0+2eE=", + "pom": "sha256-LcKW61aJ089lgF3fIWr9+exYZogPSAP25aU9jneZ7w4=" }, - "com/vanniktech#gradle-maven-publish-plugin/0.33.0": { - "jar": "sha256-98ZuWk7VKca4VBWlYJR5W408m84yt5aUxW/tWCYC1VY=", - "module": "sha256-iVAb28loVSXB9BGqBhibZsUq0AHl5nOdmWmtwmAyRTE=", - "pom": "sha256-5q8RrJZWHvZsUQIq5EjBSYfW1F0tVBC0dfa/bHr/YE8=" + "com/vanniktech#gradle-maven-publish-plugin/0.36.0": { + "jar": "sha256-pa1FlEUDO6ppgKXXK6+wGhs+5/mM+VOXoGvA3QzUk3Q=", + "module": "sha256-bcNdxXp3tCkMN1q9LkAucNKrhGkUDYuGwxMfvhKbKzU=", + "pom": "sha256-lDiqPyVVlncW11It0orX0aMrdzrpi1szPm1YibRcmWo=" }, - "com/vanniktech#nexus/0.33.0": { - "jar": "sha256-3G6e0+IQ8+wa7O0Bab/40iFEcr1XzbYbTsTfKd8ZvqE=", - "module": "sha256-zAwWFf5fDjSTipzF5BNfRbJCMb1V7Z4O+qSMlhDzFRs=", - "pom": "sha256-aDzsbi95y+Cn5FMo0MRjb4v867LhYLKnnrm7VX/bn7w=" - }, - "com/vanniktech/maven/publish#com.vanniktech.maven.publish.gradle.plugin/0.33.0": { - "pom": "sha256-LdzRS9ze0cyyXov5QPp4lEGDU5yne8fjlWiAuazRkCQ=" + "com/vanniktech/maven/publish#com.vanniktech.maven.publish.gradle.plugin/0.36.0": { + "pom": "sha256-FZ4gZXzVQCzC6P1dPpjE4HWpx/eY/zrp7eHLhVPlKj0=" }, "commons-codec#commons-codec/1.20.0": { "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=", @@ -268,6 +275,9 @@ "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=", "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224=" }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": { "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=", "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc=" @@ -289,21 +299,24 @@ "jar": "sha256-8O+lzhMY8OPnNPNSONrMRBxlEMtvP+5tHP0+uuFeK+8=", "pom": "sha256-Vig2NEoy0Fbmqt30mLSREhQfpAj0CQ71bIBnP+5ZgUs=" }, - "org/openrewrite#plugin/7.30.0": { - "jar": "sha256-4v2z9miIXAdDM+HpHKqASXp2RhGByp1phzLG8FaTovE=", - "module": "sha256-d+bO3jFBwbKyk4kZ+Fd/JJEe0umKtf8QGamIOJXKJFs=", - "pom": "sha256-GYrzCiJwhahrznKnoC8gNUwcgCw5JTV+3oVOftehrm8=" + "org/openrewrite#plugin/7.32.2": { + "jar": "sha256-FQzvzcf0v0041LcH/W4stXLbixENtZk607DY4VxEBZ4=", + "module": "sha256-uZwKbtrtyZhyngrqlU/I82vFxF4+lP7zk6nKls8ONXU=", + "pom": "sha256-lxEplWjv98vBd7IdTzDeVDdY7Xbf/B85OOVxmV3XLF0=" }, - "org/openrewrite#rewrite-bom/8.79.0": { - "pom": "sha256-TUuYOjiEJuq35xusJeIPGD69dLHqXfjV1dXQDZlTR7c=" + "org/openrewrite#rewrite-bom/8.81.6": { + "pom": "sha256-TvJDYuygE/mwH4NrDf6muPoPH6me3Uax5zvOYUZqvf8=" }, - "org/openrewrite/rewrite#org.openrewrite.rewrite.gradle.plugin/7.30.0": { - "pom": "sha256-0ZPpn8TX2NnkohTmcJJ8/ovC3fl8mD+zUOflrs3Ww64=" + "org/openrewrite/rewrite#org.openrewrite.rewrite.gradle.plugin/7.32.2": { + "pom": "sha256-Hv7oemImUDYKkDQRDpaRQhyHRIBvZpsi9RLzxoi9kOw=" }, "org/slf4j#jcl-over-slf4j/1.7.32": { "jar": "sha256-YPO9pZIuORKInMoTEdGyJ3U2EL9gy05ekU6LLqoDJrQ=", "pom": "sha256-XxjqwsVFj/zEAkFWEMO3jkmQAhaL+OyP4u/h3lBqJ1Y=" }, + "org/slf4j#slf4j-api/1.7.36": { + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, "org/slf4j#slf4j-api/2.0.17": { "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" @@ -314,6 +327,9 @@ "org/slf4j#slf4j-parent/1.7.32": { "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA=" }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, "org/slf4j#slf4j-parent/2.0.17": { "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" }, @@ -344,6 +360,13 @@ "org/tukaani#xz/1.9": { "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "se/patrikerdes#gradle-use-latest-versions-plugin/0.2.19": { + "jar": "sha256-f03gD8+KD8Q642k3QCcpcjpMP8s4YAim08J062Ovp4g=", + "pom": "sha256-DandyT01O4aikTW/HhUAtMErMAef/ZQBcwSsGiwhaG4=" + }, + "se/patrikerdes/use-latest-versions#se.patrikerdes.use-latest-versions.gradle.plugin/0.2.19": { + "pom": "sha256-4aWsuOnguyObmkgpxDYxMPZHXBvIuZjLKVsWg3iG554=" } }, "https://repo.maven.apache.org/maven2": { @@ -351,6 +374,9 @@ "jar": "sha256-9pwt46aVwRPRJayAU8kqaAo86dAuolhFCVzy1GJqdmM=", "pom": "sha256-WCLfSRg9+SK6Wa53Oi2Mzrhq4eIPQfGYcxMd0YJJT3o=" }, + "com/fasterxml#oss-parent/41": { + "pom": "sha256-r2UPpN1AC8V2kyC87wjtk4E/NJyr6CE9RprK+72UXYo=" + }, "com/fasterxml#oss-parent/43": { "pom": "sha256-5VhcwcNwebLjgXqJl5RXNvFYgxhE1Z0OTTpFsnYR+SY=" }, @@ -366,17 +392,20 @@ "com/fasterxml#oss-parent/68": { "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc=" }, - "com/fasterxml#oss-parent/70": { - "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk=" - }, - "com/fasterxml#oss-parent/73": { - "pom": "sha256-SG2NomL0LJwA8+fP/xRxRzNHz8ae3X8GT8lxlN4p1m4=" + "com/fasterxml#oss-parent/69": { + "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18=" }, "com/fasterxml#oss-parent/75": { "pom": "sha256-/LvxwYyQR+aRfThPIGTiG0Klj8hfsFI6ni4BXv98YZ0=" }, - "com/fasterxml/jackson#jackson-base/2.18.2": { - "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo=" + "com/fasterxml#oss-parent/79": { + "pom": "sha256-kga33Wf7E4A2V2w9/KlHoqjz4sTS2cHy0d6lGbOk2uE=" + }, + "com/fasterxml/jackson#jackson-base/2.12.5": { + "pom": "sha256-gve+rBcKLpw4Z9r5l6ecH+mEwAQb44DRspNQYkEqISk=" + }, + "com/fasterxml/jackson#jackson-base/2.18.3": { + "pom": "sha256-1bv9PIRFIw5Ji2CS3oCa/WXPUE0BOTLat7Pf1unzpP0=" }, "com/fasterxml/jackson#jackson-base/2.19.1": { "pom": "sha256-tzFwCGYicYqn1sGsCpSbZVD5vRSkRnLBo/K457doLhQ=" @@ -387,6 +416,9 @@ "com/fasterxml/jackson#jackson-base/2.21.2": { "pom": "sha256-OMeJjHY7iZH/+9dpRZly4Bdr8MUFxzlRjHD3xX0W7tc=" }, + "com/fasterxml/jackson#jackson-bom/2.12.5": { + "pom": "sha256-OsaSx58vsDotQvL/fMrYO3bmgKH5y5L13020+DouyYA=" + }, "com/fasterxml/jackson#jackson-bom/2.13.4.20221013": { "pom": "sha256-y2P4/5jHzL5THjdkviyR0nW4/P4pcs1nqn8KeBojmjY=" }, @@ -396,17 +428,14 @@ "com/fasterxml/jackson#jackson-bom/2.17.2": { "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" }, - "com/fasterxml/jackson#jackson-bom/2.18.2": { - "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs=" - }, "com/fasterxml/jackson#jackson-bom/2.18.3": { "pom": "sha256-8dTGrrMhGGUMgF/pu8XulA+o8s19DwT6Q2BVHponspA=" }, "com/fasterxml/jackson#jackson-bom/2.19.1": { "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4=" }, - "com/fasterxml/jackson#jackson-bom/2.20.1": { - "pom": "sha256-DGRn7UyMc5JSTOcDymzj7YhZbuw5DxOwwmTy+WEwilQ=" + "com/fasterxml/jackson#jackson-bom/2.19.2": { + "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM=" }, "com/fasterxml/jackson#jackson-bom/2.21.1": { "pom": "sha256-jXx43eEPTQjnKWzvCEzzC3etzqejbiPRUgeT/exj/yg=" @@ -414,6 +443,9 @@ "com/fasterxml/jackson#jackson-bom/2.21.2": { "pom": "sha256-vGxUnmMpJ7udigraIMhGe1AH07eXx/XbA6m2DR3lm+M=" }, + "com/fasterxml/jackson#jackson-parent/2.12": { + "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s=" + }, "com/fasterxml/jackson#jackson-parent/2.13": { "pom": "sha256-K7qJl4Fyrx7/y00UPQmSGj8wgspNzxIrHe2Yv1WyrVc=" }, @@ -426,8 +458,8 @@ "com/fasterxml/jackson#jackson-parent/2.19.2": { "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U=" }, - "com/fasterxml/jackson#jackson-parent/2.20": { - "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U=" + "com/fasterxml/jackson#jackson-parent/2.19.3": { + "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI=" }, "com/fasterxml/jackson#jackson-parent/2.21": { "pom": "sha256-OFHfYn+utGiHuVYQRjC3Sou7X33iLpdM8VmC4g4Dc94=" @@ -441,9 +473,13 @@ "module": "sha256-yuj/7OwzKLbsuxOOJ0IY8v4cdymg6CTaVZJogQCVrUQ=", "pom": "sha256-ccrFOSFR4qUozJoJF58KM0F58FxS+OWWz1jd8Suyfys=" }, - "com/fasterxml/jackson/core#jackson-core/2.18.2": { - "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=", - "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4=" + "com/fasterxml/jackson/core#jackson-core/2.12.5": { + "module": "sha256-q+4Xd6yaLJWc0v7D/bXI4hid0CMYRM4Zciinfe2r7qU=", + "pom": "sha256-KOA9N9ygsxWoKSJRow0nyKZ+W5YGM1lYC4Qn7ZF8Fes=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.3": { + "module": "sha256-mDbVp/Iba8VNfybeh8izBd3g5PGEsqyJUOmhsd9Hw0A=", + "pom": "sha256-N9xrj2ORpHCawhXKmPojQcbdZWE8InfZak/YKi9Q48k=" }, "com/fasterxml/jackson/core#jackson-core/2.19.1": { "module": "sha256-SZrw5ZPg0uFL2SnjRJnXIqbtT0KxsJ4inrzUgCzsF60=", @@ -512,9 +548,9 @@ "module": "sha256-MkCHqNbUxkhBqe1R7t3lhw8xQnR2wG1QGxTWcRjSZb4=", "pom": "sha256-kS6F4iGHClCQbJcISkQrJTwJfpbZ8y/Xwk7/XOyAxCs=" }, - "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": { - "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=", - "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc=" + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.3": { + "module": "sha256-Kt37kDio5g8OlWOZLC3sdYpQxDvH8ECVnYXbbp1o04w=", + "pom": "sha256-LIA9pFO2CM4OQ6FscvAaWf5Dg++oV6jxszQhc2bqJk0=" }, "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.21.1": { "jar": "sha256-TWM3iwprU3M/CG69MBAjuiEbk4fkF71YSlQAMgzQi40=", @@ -567,8 +603,8 @@ "com/fasterxml/jackson/module#jackson-modules-base/2.21.2": { "pom": "sha256-qVLG+eo23+odRjGC1fBqdFLbZ1Hcso/BrdN0ir/6WN4=" }, - "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": { - "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY=" + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.3": { + "pom": "sha256-rehezbxjw22XyQcnNfQfeUGO+K0EA755gtr/9BxfruM=" }, "com/fasterxml/jackson/module#jackson-modules-java8/2.21.1": { "pom": "sha256-gN/cby92+kwGXhHcdFMaAkRyRfFBWzoScCgf/NjJK1o=" @@ -585,54 +621,37 @@ "module": "sha256-J9/TStZlaZDTxzF2NEsJkfLIJwn6swcJs93qj6MAMHA=", "pom": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w=" }, - "com/github/spotbugs#spotbugs-annotations/4.8.6": { - "jar": "sha256-RUi3SoFe1E9UgMpPBiBKiwCAncfl9qglqe3xj0A3e2U=", - "module": "sha256-2ye9p0GFWoGc1Q6dYSMMQv4qoqZEuU1zMTwFIXrgUjk=", - "pom": "sha256-3U71+ubjJmCxUtecvHW8uuM0JWxX3ID8TfDhdhWZRWI=" - }, "com/google/android#annotations/4.1.1.4": { "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" }, - "com/google/api#api-common/2.53.0": { - "pom": "sha256-hfEZR5sbUaSepG31tUNS/Yy4/o/48Q+hmjrpqFebYjs=" + "com/google/api#api-common/2.63.0": { + "jar": "sha256-yfXRLgnTQUN4N9SgRRuttxCcz2Si/j6PuBv5NlzyQ6k=", + "pom": "sha256-pvcM94/H2ZCkxRwsM9XWOvXHMhtvc7erFClQrJ5Ba00=" }, - "com/google/api#api-common/2.60.0": { - "jar": "sha256-Fui9VnoKzr1inhvJu5jVKupuh2VPShxPO7wlq6nbVLk=", - "pom": "sha256-DN6oxzgQsfScg2Fj9MLXT53ryqUCaU7To7nYJG9htho=" + "com/google/api#gapic-generator-java-bom/2.72.0": { + "pom": "sha256-sY12lkVbPQzZEXOcQpMwluatvtBKioZOkBsVITK7upk=" }, - "com/google/api#gapic-generator-java-bom/2.69.0": { - "pom": "sha256-fvGZScqfnfDdOnxCfZHEdZTc3wS7kUkSAn9QhAWPS9I=" + "com/google/api#gapic-generator-java-pom-parent/2.72.0": { + "pom": "sha256-xax/GoGTaJJFBdSiMM/MLnv78lwgRqorjonMgrPAYTo=" }, - "com/google/api#gapic-generator-java-pom-parent/2.62.0": { - "pom": "sha256-hX4La1G+GTsAmdgkaHw4PEkrDHiELBL+BF6yssnw+oo=" + "com/google/api#gax-bom/2.80.0": { + "pom": "sha256-FIGmSUGFHrY1fWf3KxxcewLcTXLSoJb9vsTqfIPPb7w=" }, - "com/google/api#gapic-generator-java-pom-parent/2.68.0": { - "pom": "sha256-D1bAtMafTl8YdzuhUj12p3jYALXOoAEWi5o5CZHzQRM=" + "com/google/api#gax-grpc/2.80.0": { + "jar": "sha256-wjvfTkzF5npRabvHRoDJWztFh46V3tHNqMXQ0c2dQ68=", + "pom": "sha256-iYMbk80o2dJRI88FlmgYgMpNJk4BhH2d7/6oXuOYs/w=" }, - "com/google/api#gapic-generator-java-pom-parent/2.69.0": { - "pom": "sha256-FAcQvP99LntqRIlJ0Vu+nM6xin55Wk+bBRQts6+3FYs=" + "com/google/api#gax-httpjson/2.80.0": { + "jar": "sha256-kyVR8kf7XlwQq+q6HQeiIx8UTvDeY4Q+jRldw7qnOt4=", + "pom": "sha256-dddDs6lBjXz5spkdjWZLrs/DtkG4caE9QlSDIPOYues=" }, - "com/google/api#gax-bom/2.77.0": { - "pom": "sha256-I72S5y9hdMMwu9oZjPZAP5ebzICTOTxwd4H2T0LRvck=" + "com/google/api#gax-parent/2.80.0": { + "pom": "sha256-K3tZZ62+ReT9D5p91GqpBBowJf7MJ+kKKsnR9TkHDyY=" }, - "com/google/api#gax-grpc/2.76.0": { - "jar": "sha256-VBeaybFA8YD9no1ZRp4qwRVRF7g/8KJitbbYj3Fx2+E=", - "pom": "sha256-TcasWzKzooq871yIC8zWl4ttBldgVWAxiS+s2YYH9F0=" - }, - "com/google/api#gax-httpjson/2.77.0": { - "jar": "sha256-97halRJ+ufjtAf9WgCSzdpmk7r4ttmS1vOfZJSrXJeQ=", - "pom": "sha256-qpODjjC+GBsAwFKxsWZ6Vq2hXZwCMzmpy6PIYWhiICA=" - }, - "com/google/api#gax-parent/2.76.0": { - "pom": "sha256-PSjTgpd0Eu/SpNxlSLUchFWrXrFmalXi66hEKh9L6/0=" - }, - "com/google/api#gax-parent/2.77.0": { - "pom": "sha256-90m6PHvk30/PfAis7+TE9FTQRjqV+0m3PQv/AmOJ264=" - }, - "com/google/api#gax/2.77.0": { - "jar": "sha256-O01bkMTujI10ca7gftbBo/x9yl6nDAZ02bGgnxwKj40=", - "pom": "sha256-5N8dn2b38/DLa/Tn/dkqps+n9clIYAMmlibLxqQDsyQ=" + "com/google/api#gax/2.80.0": { + "jar": "sha256-6tYKkNfNqHr6QmvSR+NYWPxpGPcnNKgrVXer8swKLak=", + "pom": "sha256-U/CuCZ6h1VjvvSmcgq2Ojo0D8ow6uFEU3aux4Wpja+U=" }, "com/google/api-client#google-api-client-appengine/2.9.0": { "jar": "sha256-oidSwvRJQqzJB5yoe6Ng4rxBTgVLJoxTm1aVNlEqagY=", @@ -652,45 +671,45 @@ "jar": "sha256-RhN3pckE6OTgCRzRtHUrye9YtyI9YIiG2WQkNtSyEnM=", "pom": "sha256-26WuIKcu/3kVtBkdrj29yL9Ou6wBwt0q2AjsCgjiIW8=" }, - "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1/3.24.0": { - "jar": "sha256-dOQRW1GPuYY8a+MVJbVhhJQCeUPEnb41M9aAPqLFNcc=", - "pom": "sha256-gg10ZOX+cXH70b2Au650Sc+OfKcwYIP3r4g2yIQtiNI=" + "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1/3.28.0": { + "jar": "sha256-KeRS/2dLYDyaFa9D4GBwow/l4VCNVZa4v0cB3wd66u8=", + "pom": "sha256-5nc/3c/RmBQV/zYtAUyYQhTTaSRMVkSIrP8dwXHikuI=" }, - "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta1/0.196.0": { - "jar": "sha256-FfbELK2uoonFCv4bfWZxgSCEn2vtNQ3O5sOS3eKj+xo=", - "pom": "sha256-JSipv5qEcnLOCQqGbUS9Ijg1+2r8ENhkmQ8WcSbN9fw=" + "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta1/0.200.0": { + "jar": "sha256-93ncZyJGESfAOB0NTmIjZYo8+sSOv7kY3Z3mfTp0Hoc=", + "pom": "sha256-neYLlKScm1mlV8zzEEfaMKGiJT4tqodpXuf4ziRbo30=" }, - "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta2/0.196.0": { - "jar": "sha256-cQjqqkKe31BEORrVbbtgkgqYJnPRxLI3Pz74SM37j60=", - "pom": "sha256-9xoeUskTqUGWrzphmrsabCUDRsa/E5hI6JQsEruA8nI=" + "com/google/api/grpc#grpc-google-cloud-bigquerystorage-v1beta2/0.200.0": { + "jar": "sha256-J5OXnxJULuDe6YrC3OhpKDaWVFSohZAnQ8Ahk/G4jio=", + "pom": "sha256-RvQND2gKojLnpgVogu8UaGJflf+KJY3CLvXmfKsIBps=" }, - "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1/3.24.0": { - "jar": "sha256-5s6IZXQc+mu55BXPCijqMZgPoSJsj9bC5PUyhRTfChw=", - "pom": "sha256-UoCw1jbOp8sF2qFnLdXXa4kKl9aIEa1JZVqVPc1gg+g=" + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1/3.28.0": { + "jar": "sha256-PiB3p2cbynwQpJsv12OJXvDbHOQHzOjpInMJPEu7uDg=", + "pom": "sha256-0ep61VmalKcSorXeP3PfgQfJgQt/agWF8KLFJ9vipeY=" }, - "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1alpha/3.24.0": { - "jar": "sha256-fa2TzXqORh8Xv8y+qfSNOpW+WF3oJn286DdUdjCQBEg=", - "pom": "sha256-ZPJuXJWR6lomBVO0It6Mvlr2wjP16+/Ulg7r1oMt81M=" + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1alpha/3.28.0": { + "jar": "sha256-47M5V/+U6wFzyVoWhfOW+LUU3A09+j4oYIH6EI+tvUU=", + "pom": "sha256-s/bP2lwY5YTiKv247BAbl2FGA1LaJikRSKBEa1fKphU=" }, - "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta/3.24.0": { - "jar": "sha256-bDre0zkVVlo3zNsE6dkD4sv8c0NoFndVZ3bwTdZbW3I=", - "pom": "sha256-iFXjzbHhSbblytuf/xi3BSeZ1bSW92E2WiM19cR8cXs=" + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta/3.28.0": { + "jar": "sha256-+9a/bL5U7aRZjH8KlHMHpMeCpzc4NT+lowFYryIttF4=", + "pom": "sha256-uqPDlW4J4HqWyOTp6aRyJ7I/3lS6JJNaxusyVJV5nZc=" }, - "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta1/0.196.0": { - "jar": "sha256-MjW2c0CjMLd8w4Acf1IN0zaJJ/aUwXe3nGDQOOFLm8Y=", - "pom": "sha256-Tcof1FGo3sMOhs/sbWS0FbI/PI+zPhQ590OQU4GxwrU=" + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta1/0.200.0": { + "jar": "sha256-/YjJ9WVjI8gD2EHA24bqjFpLxGOgTWAybrut/tkLAl4=", + "pom": "sha256-3ukGwdvZpyBLc7Uljxvx401yxFngRHVBIualKk77t+g=" }, - "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta2/0.196.0": { - "jar": "sha256-WT+3nLtlmcvpLoP4LQImmK1qNsWfGE6Q4ftUgE4D1qY=", - "pom": "sha256-vT8/PXZcgi1ywTWPxQSSSwne7f4UwCHH7EuReuEGogI=" + "com/google/api/grpc#proto-google-cloud-bigquerystorage-v1beta2/0.200.0": { + "jar": "sha256-7XhrdoaZQRQP9zrYqU5NqxwWzfA65Wh/1oFYDygFwqc=", + "pom": "sha256-u95d1piREwwJ0e/RgHS9zI5zll5CTa9o7ocp4480ZME=" }, - "com/google/api/grpc#proto-google-common-protos/2.68.0": { - "jar": "sha256-paz0BTjotCRm135dTascvSZgXbUo5o0mp1A4oEJYisk=", - "pom": "sha256-7efrX70fhsVAcp0V9Oj8GgfvO/kEplZWkL8j20iQTcc=" + "com/google/api/grpc#proto-google-common-protos/2.71.0": { + "jar": "sha256-9tHGKBtEyTv1pDwmh91rcBHBU5ntsu3InRJIxDef6kI=", + "pom": "sha256-Sp57j5lQJRIbNAFh1rOXaPFr9LHiAMtY6NjEvndWuCc=" }, - "com/google/api/grpc#proto-google-iam-v1/1.63.0": { - "jar": "sha256-DsGwnStfjC1aZYZUD5889zUe/QfApGROoptIeL2AS6g=", - "pom": "sha256-XJuXk4Hy8YINdy3dBpzUC/1LJk0SciOGFgXMFJqx2YU=" + "com/google/api/grpc#proto-google-iam-v1/1.66.0": { + "jar": "sha256-JCr39LGmhpDIuOsXwz9MvF5cOcjnIhFFxlcL5GPoBCY=", + "pom": "sha256-8SF5l4qbnjtOgDwbP/keS/tve6rrvNtrdO1PcJamTTs=" }, "com/google/apis#google-api-services-bigquery/v2-rev20251012-2.0.0": { "jar": "sha256-qy5pb1JteP0tlYFTO9VXzCxVoPX95HYi6PFYzA1dVD8=", @@ -703,19 +722,16 @@ "com/google/auth#google-auth-library-bom/1.30.0": { "pom": "sha256-mSCzPghCOTmuWu2116O+wBWYvyZkSti6bnul2ov3ajY=" }, - "com/google/auth#google-auth-library-bom/1.43.0": { - "pom": "sha256-BpV9Cbcr5c5mX024kz4gVrhZfPHqhzp85ucqQdae7bY=" + "com/google/auth#google-auth-library-credentials/1.47.0": { + "jar": "sha256-fGq8vZa1H3Dk1ZBE3qbM6HOlJ8qrjQjTmg2j9PWFqp8=", + "pom": "sha256-WIm5FeYi9WBpFue8SMFFiaxN6XatsbVdUZBEJ7Yhw4E=" }, - "com/google/auth#google-auth-library-credentials/1.43.0": { - "jar": "sha256-cjIopfDIKdXFEXkQ0bHsCvqJgwU+tNagjiNyH2Itqgo=", - "pom": "sha256-n9D8K4pGu21rferY2a47n4B3CrhwZbYd9m1nolq89UI=" + "com/google/auth#google-auth-library-oauth2-http/1.47.0": { + "jar": "sha256-nQIECDRBlC3xLHKU703x//Xt54SmUsE4tslQF5BAbp4=", + "pom": "sha256-kbqgJmtyKMVR586UJ/VF46UBDILLlXlmftsM6XxdWug=" }, - "com/google/auth#google-auth-library-oauth2-http/1.43.0": { - "jar": "sha256-sgERNyfulhWt2XlGSx+Rg07QkMVl9aJvaYCMAW6CBhs=", - "pom": "sha256-UiYXgf6mXrd42a/6rEg8+C1zR3oFpDh0Patt0L/ytao=" - }, - "com/google/auth#google-auth-library-parent/1.43.0": { - "pom": "sha256-UqhTnueVTmnDfoM0435+vVvoXcNBISkBmWdAG3zbXJM=" + "com/google/auth#google-auth-library-parent/1.47.0": { + "pom": "sha256-QEonKD8kn8p4IK98O9EUJ2YINVWkZEitQFb4AB1S714=" }, "com/google/auto/value#auto-value-annotations/1.11.0": { "jar": "sha256-WgVc5CVTM7M0bhqHA9pb+P8ElTIob9zTFxLWJKvhEd0=", @@ -724,62 +740,56 @@ "com/google/auto/value#auto-value-parent/1.11.0": { "pom": "sha256-Wg0dcYVS6KRdzOASjRtrliP6lxqCzSRXUyM7pyCMsp0=" }, - "com/google/cloud#first-party-dependencies/3.59.0": { - "pom": "sha256-0O+WEzt6pDL+mz/lEUmpP5PlGTS0x9kH7OVf250fehU=" + "com/google/cloud#first-party-dependencies/3.62.0": { + "pom": "sha256-lJN8n0kh1RoazDsQYpOew8ZJEe35a5Nv1DLhX3++i0w=" }, - "com/google/cloud#google-cloud-bigquery/2.62.0": { - "jar": "sha256-WNSk98/jMECOjgvTomPFNSm7e+prjGTX84oVduwQHF0=", - "pom": "sha256-NFJ5tvyGoJNyNpNRvY6oKcLgJ6w9CkH/yFgK/guLBfk=" + "com/google/cloud#google-cloud-bigquery/2.66.0": { + "jar": "sha256-zLWJN/TiDsE8/1Hz2hxvITiO0S+UGDoNYyVUtLAKOac=", + "pom": "sha256-DH9kdpuX2HxumvUUvB/IlDuICN0FrPqGjDjhbYKhe0E=" }, - "com/google/cloud#google-cloud-bigquerystorage/3.24.0": { - "jar": "sha256-GT96MwCionOBWnky75a0uM0NGxEwQ9FV+3+ljR3fw+Y=", - "pom": "sha256-o8MZpm1hvd1A9qwyBKByhOzG+dwyyoVB5E3NYXG3tx4=" + "com/google/cloud#google-cloud-bigquerystorage/3.28.0": { + "jar": "sha256-4EJVe2qjkCT7jGSvR+DdpCtnLEERpYS03UHiHRzxE1E=", + "pom": "sha256-3rwVcwZIAKTQabAvaMkrGueiJn5BQrYJkXFqSP59h7c=" }, - "com/google/cloud#google-cloud-core-bom/2.67.0": { - "pom": "sha256-8UUcUqGRhgNt3yT47PvW+yWV6gChcirkyHsIShAAcg4=" + "com/google/cloud#google-cloud-core-bom/2.70.0": { + "pom": "sha256-JW9N5AEIHnHjbI6a/pK0vbn74dMSMdl1C5WiOIG/Kho=" }, - "com/google/cloud#google-cloud-core-http/2.67.0": { - "jar": "sha256-dvIjl6JLzaiB3pbkraOfHcEaPVZq8uuISMn7UF35jD4=", - "pom": "sha256-DNCVPPNJM6P/NAiV+JM6cyxy0tJ1gmMiAU4lIIQIY4k=" + "com/google/cloud#google-cloud-core-http/2.70.0": { + "jar": "sha256-cE/KDrpa4+TCNpP/oqmxRZLCvOaawUjqnYmjL9dRMl0=", + "pom": "sha256-nI1dbPWBu5hZCy8SrlP8o/DtpvM1zWHi1fkuFxTgknU=" }, - "com/google/cloud#google-cloud-core-parent/2.67.0": { - "pom": "sha256-7Ty1F+H/N+vmRGttsF9rLKsFokZNyjHeYN93i+f4ZwI=" + "com/google/cloud#google-cloud-core-parent/2.70.0": { + "pom": "sha256-0UjXRZB8YFm5jPNKmY1sruCgFr7FL6bY6/1nzg5mALA=" }, - "com/google/cloud#google-cloud-core/2.67.0": { - "jar": "sha256-M+TYVCF1Sv8g69q0Nnh1AgMuo9QqDNA6zZ9QpzfkE98=", - "pom": "sha256-Y2TwLSZB2Qyjg+5qhbWszq4hr6duVuxEVse6oEqQskM=" - }, - "com/google/cloud#google-cloud-shared-config/1.16.1": { - "pom": "sha256-MXT7SNiJF6VCBog/zIecRqBBWXJ3Zu240qdJ0SCnnuc=" + "com/google/cloud#google-cloud-core/2.70.0": { + "jar": "sha256-6utnHokzRrCgTbBIbhQnG+bIbrHDJarwSVw/ZboR5sY=", + "pom": "sha256-CaAVM3txg7t0k3Dkdnkv7StUqhyxi5tSfeZG19c/nFw=" }, "com/google/cloud#google-cloud-shared-config/1.17.0": { "pom": "sha256-G6+ucuK+eVDVlWs5OFy5Z7I64enW9S8opGpfpEsvg7A=" }, - "com/google/cloud#google-cloud-shared-dependencies/3.59.0": { - "pom": "sha256-4S5qub2bNcfGB+d6cw/WVGeXFTZXdPPKGWO/TnR9fq8=" + "com/google/cloud#google-cloud-shared-dependencies/3.62.0": { + "pom": "sha256-Uh+SeL2RIQtWkX/dJwpvEupmZlUw4Ed3lfneCcwcpww=" }, "com/google/cloud#native-image-shared-config/1.16.0": { "pom": "sha256-oC9dmGuHE9zoAhed38jE3fhUhpEs2ygKmLKmB0KEbiY=" }, - "com/google/cloud#native-image-shared-config/1.16.1": { - "pom": "sha256-QN9I9Uh8R7+4ROOiTUomQTA/I45yHXU/Ag2WnyteQYc=" - }, "com/google/cloud#native-image-shared-config/1.17.0": { "pom": "sha256-oI+9hHMAJ/x1SuKNAnOG+uhygGTdShtkKPnoIf4RKfs=" }, - "com/google/cloud#third-party-dependencies/3.59.0": { - "pom": "sha256-+NGC2C8UYR+pOxUWd6jYRwJdFB/WnGxRYbfSt2EOu5w=" + "com/google/cloud#third-party-dependencies/3.62.0": { + "pom": "sha256-nr/uL+qBmqG6sD6f1t+CF6kPgEAz+IuoE/ypYWPIkKg=" }, "com/google/code/findbugs#jsr305/3.0.2": { "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, - "com/google/code/gson#gson-parent/2.13.2": { - "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0=" + "com/google/code/gson#gson-parent/2.14.0": { + "pom": "sha256-grD2aUxXWKuLsH4FYwII1Q9YnUteBP0KBG1Zzfe6PR0=" }, - "com/google/code/gson#gson/2.13.2": { - "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=", - "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y=" + "com/google/code/gson#gson/2.14.0": { + "jar": "sha256-LL0Rm/GWHCh4gxCWPcgLpl9Yze7B3ROci9sSQPqiw28=", + "pom": "sha256-H6ASLA43MxkmQoYcNr5Mb3maeVMnojvdKSJpG26bpIA=" }, "com/google/errorprone#error_prone_annotations/2.10.0": { "pom": "sha256-1oDcn1eKd6bc2ZKywyUOsWinIUzyf48MrB8GUmcQwMw=" @@ -791,9 +801,9 @@ "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=", "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4=" }, - "com/google/errorprone#error_prone_annotations/2.45.0": { - "jar": "sha256-a6YVEOIpROiuw/6XCXLQiNjaEyok8ryBekPHtwZlzCs=", - "pom": "sha256-lb5z+ah4dsla7xDcxUk44fHEWihQwxbDP73s1ZD1EoA=" + "com/google/errorprone#error_prone_annotations/2.48.0": { + "jar": "sha256-tJxclYMW7WegnGmd2pqnScr0NNUdhj3qWZ7zakm5yFU=", + "pom": "sha256-GJ4JrQSJwyXpDaqp1cj0BjMGAvo2Zgm8oHy82tA6udo=" }, "com/google/errorprone#error_prone_parent/2.10.0": { "pom": "sha256-B4kah8SQ+QDBIJe+6V7By24HHIp9+BBmY4fgx3Lwifo=" @@ -804,8 +814,8 @@ "com/google/errorprone#error_prone_parent/2.41.0": { "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI=" }, - "com/google/errorprone#error_prone_parent/2.45.0": { - "pom": "sha256-zgCLlZZS2RDuVHgcvGxsU8Bj0qoIOjAHj0pD/JdFZmg=" + "com/google/errorprone#error_prone_parent/2.48.0": { + "pom": "sha256-sz+opFyfF5SlAIwLLYOoTrKLXQEXptFW8AP58JvnQQ8=" }, "com/google/flatbuffers#flatbuffers-java/24.3.25": { "jar": "sha256-9bUANKU969qYCsqAO4sGlJ+TpAFjvB22zWlYHTcY41U=", @@ -827,16 +837,9 @@ "com/google/guava#guava-parent/33.4.0-android": { "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM=" }, - "com/google/guava#guava-parent/33.5.0-android": { - "pom": "sha256-vXfMLa2RkS8aO/+nv35Xbs9XmS9Y+a+hMv1h7yULqt8=" - }, "com/google/guava#guava-parent/33.5.0-jre": { "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU=" }, - "com/google/guava#guava/33.5.0-android": { - "module": "sha256-VBlBS+YhDjiUXoYbX2HoLM9pCnlUh32w6Qg7ynO1wNI=", - "pom": "sha256-fT1kSzi6wDHGFcPoun4A3CE1u63BHqWaSNvO3EIqYqA=" - }, "com/google/guava#guava/33.5.0-jre": { "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=", "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=", @@ -934,29 +937,29 @@ "com/sun/istack#istack-commons/4.1.2": { "pom": "sha256-2Ig+twNkcB2uDjdEnIj9knUResPYYEDonxvj6dR+nJ0=" }, - "com/tngtech/archunit#archunit-junit5-api/1.4.1": { - "jar": "sha256-WZ6whJcjV3PKY5BfUw1OinOEuLQp6qmRN1hQIipx7+0=", - "pom": "sha256-MqPqumpov+TTE5/kGBf91kHhIeIU+ulkHxuACDFkjU0=" + "com/tngtech/archunit#archunit-junit5-api/1.4.2": { + "jar": "sha256-1RVEzEjhycgFZw2jh24ouysH6QmE9eST0VsGHRHbtx4=", + "pom": "sha256-w20V+8fAQOsZfozhjET4d4xd7IzoUuXAL0lbJITq7W0=" }, - "com/tngtech/archunit#archunit-junit5-engine-api/1.4.1": { - "jar": "sha256-VYwJC5opJDrdfS6wfuoDI/bw8Rs4RXpIN+NSKL4bEPI=", - "pom": "sha256-GY1dNHJVEsfTnZ0an2iUMg2ahq6A5xLtAk+ZK+sakfA=" + "com/tngtech/archunit#archunit-junit5-engine-api/1.4.2": { + "jar": "sha256-erpADbEkEysUKjh+3Sok5E79wUtMo7KpGBUsV3DRaf0=", + "pom": "sha256-0gzTmpWUeisN5vVPluY2q4E3kXB7y1sPvCnKLavXc5g=" }, - "com/tngtech/archunit#archunit-junit5-engine/1.4.1": { - "jar": "sha256-4ADnETSA89QSvCyKJY+Q/g4rXvAF+8MXl5HjkYYQltc=", - "pom": "sha256-n+5dEyII4DunPwuXqZbaJD8fQU+2WcLJByK2raGRB3Y=" + "com/tngtech/archunit#archunit-junit5-engine/1.4.2": { + "jar": "sha256-lk99cEJhWtj3rESdF0KFrPwvuq9ccG337eeDf7fOKEU=", + "pom": "sha256-vTs/jEXOt4bLLTU3J35QiAsjgEux0K9VBeOgxZKE94U=" }, - "com/tngtech/archunit#archunit-junit5/1.4.1": { - "jar": "sha256-bdJ7q/BOqivIbo99MpYXVGUWQ79iXsF5Q6woaWsA/90=", - "pom": "sha256-psKMkV437DAgaMSiFaQzD9K6A6IeqeO9jcribu2pwEg=" + "com/tngtech/archunit#archunit-junit5/1.4.2": { + "jar": "sha256-zSZB30HHBZ4h1GMcB8C6KEkVphhrhn9MAHXVa+Q8nkw=", + "pom": "sha256-Ivkt37EdweOiUrNRvjP4gYWvw4koGsFQE5ZN2PL/QGk=" }, - "com/tngtech/archunit#archunit/1.4.1": { - "jar": "sha256-apJFjFRDCOQspTTPy9tvGUfqSpyocX4IfNZx0x8tmww=", - "pom": "sha256-PEMEhZaX+gSgrnvQr4VeXiPI2qJvYiy8PquqO1b4KDQ=" + "com/tngtech/archunit#archunit/1.4.2": { + "jar": "sha256-bYrfaaPxCevhs5V2T+sH+Rnp4OKrXi6hQdLmJRun0X8=", + "pom": "sha256-BWGCmFRShtaX+m0Gb2Wuv/f2jo7IjL8sPn13zhjyZjY=" }, - "com/uber/nullaway#nullaway-bom/0.12.15": { - "module": "sha256-03CYL1dme13VC7urRqkNTGBvBt0WBlmNtalnX+VvB08=", - "pom": "sha256-K0j45WK5BRbeFEIxRvBAd9hsyuULw7dmpVwPQizHlvc=" + "com/uber/nullaway#nullaway-bom/0.13.2": { + "module": "sha256-33K0LrlU5MraCGQfmgqy2yPtZOnXHDd1IkH0Bsdx5sY=", + "pom": "sha256-zMKscMWKcWlfGEk6HtLIjfmEYBsQxQt6IeOPEsMRmos=" }, "com/univocity#univocity-parsers/2.9.1": { "jar": "sha256-MWhRItXjkumGcu1gCalaTBYjyhGFVnvUTulFJ9RU5cM=", @@ -981,69 +984,62 @@ "jar": "sha256-blZOKc7JWjkiaKYJ8JBx1WGZOD2QascOkXU6eZjRo+g=", "pom": "sha256-N7I1NJqAx1rokS+gCO3unouINL52mortCLp0xbCvgeA=" }, - "io/grpc#grpc-alts/1.76.3": { - "jar": "sha256-+hB9Nbm422uYZ5OnjH47E+O8AjodLnVURV5pioY9GKI=", - "pom": "sha256-5iDqeJT0iHZoSmolfAy/O+NMxDe0oMHhpMxPwtU0IdA=" + "io/grpc#grpc-alts/1.81.0": { + "jar": "sha256-08vTjS8QxqbNqjLv7PO37qexDR+uvgrkaeDfu6JSCp0=", + "pom": "sha256-j2q5aXL4x5JF+2dDRLuqJBFx1CvjZ4qxZQX+xdAKvyA=" }, - "io/grpc#grpc-api/1.76.3": { - "jar": "sha256-samsYvAULwbtAck+1S1OzfQAJswYPmKI90DUHKl0uRw=", - "pom": "sha256-sOGVt4Mcg+bUEwsquQS+Oxl5pIQakTLXBwjS3OwNihk=" + "io/grpc#grpc-api/1.81.0": { + "jar": "sha256-Pmplm6PtzaxzDIV7J3JeLk2YXCJBBV6DJutP4PlXPVM=", + "pom": "sha256-LQI/jWYRPKZkkWzMgW7fNqfR7CtwJY2ioEE9OeWmnGw=" }, - "io/grpc#grpc-auth/1.76.3": { - "jar": "sha256-hPyZyrhkoajjbour7WgjyqLBuZS+RGaOs/JO0LIi4tA=", - "pom": "sha256-APfqi1aDFMWEvAyA1b/lrTHAFciU8aasV2qkw3tNj84=" + "io/grpc#grpc-auth/1.81.0": { + "jar": "sha256-fxuBFHpzHz8JfGCcy3buh1NQAnoJjkkOxUI3tmTY3f8=", + "pom": "sha256-5aUobx15Vv6lZQlNIZblHABlgkQkZBtIoJruSTa96gw=" }, "io/grpc#grpc-bom/1.63.0": { "pom": "sha256-nqMKp9l0wA3Qo962cZSovF5pOkDvitBB+hR40Ts+vv0=" }, - "io/grpc#grpc-bom/1.76.3": { - "pom": "sha256-EGIZxXxiz3mZLEeGocPmLcye98Re9mLg9D/nO95+Db8=" + "io/grpc#grpc-bom/1.81.0": { + "pom": "sha256-f1HXvBXFyaFOI+W3MUKZzKcdMjuqba9rug/02A48Kyk=" }, - "io/grpc#grpc-bom/1.80.0": { - "pom": "sha256-TSeZrEUt0sx+rCALuxbjenrHJxXXO/k0AABx9Fw0cEE=" + "io/grpc#grpc-context/1.81.0": { + "jar": "sha256-Bd5pUwb5De0B1BsIO3UA6xPcU3Ywl6yMWwJkhC3wZnk=", + "pom": "sha256-lHnsy7omzjRapqL7w3+f0NhixyByAiqFqL5OB1p+B6Y=" }, - "io/grpc#grpc-context/1.76.3": { - "jar": "sha256-GzLo7QiY9sLT29o1C4MEkcYU4ss19KIctvrf/JXnaXo=", - "pom": "sha256-/+REjt3nK95loItbBR/MQaiteMkTOhq2CYUfbKZ9cWs=" + "io/grpc#grpc-core/1.81.0": { + "jar": "sha256-P/4akd7fBgMmnOWXRpv4L5NHexKWip4NgPvUB+W6bpk=", + "pom": "sha256-D21czlUF1mQoOYVE+11J7oCSKsAlbsyC/iXJqXclQOY=" }, - "io/grpc#grpc-core/1.76.3": { - "jar": "sha256-yPfvkYeoMj7vkYcZ3Yq7k+UpAxi2K00HFNqrAA7ZGWs=", - "pom": "sha256-vMEXiKva0Gfzj4RmiDZqOz8u3zxcx+NW8lxjPciL3bs=" + "io/grpc#grpc-googleapis/1.81.0": { + "jar": "sha256-3LxmO86SLKVgBTNhlTZ828fVMmevqLSSUf5PmzsF+8c=", + "pom": "sha256-rtHMp2VZilTkabfaBAFu3xixppYQPaG9Yp+FH73ysf4=" }, - "io/grpc#grpc-googleapis/1.76.3": { - "jar": "sha256-4XyZY4t7sAzZnMgY62oiCCONllQcirxKR2DPVFodGjM=", - "pom": "sha256-mY3pUqhg6whb5f5Shm4eXQ4SSprV5moa3MKSqx5oD/s=" + "io/grpc#grpc-inprocess/1.81.0": { + "jar": "sha256-Et0kOoyvMrAAlUYKb5UxosVoWy5wH9FiyxkxrwTdfc4=", + "pom": "sha256-h9bj4vcenWM0RuIZXhGmHkopSnJKcnpY+4CmKCU/xbo=" }, - "io/grpc#grpc-grpclb/1.76.3": { - "jar": "sha256-hmXSia1TlWsGfcI3hFDxFdUIT4HzPGsIgKss0Qb/+BY=", - "pom": "sha256-4kKwz4d0aC3ndsJTfzAIDH1zvhV1NTW/rwzf0UfEMIs=" + "io/grpc#grpc-netty-shaded/1.81.0": { + "jar": "sha256-N7wEoAMR8mhybJLa2fghHSRVGkQu8Z28yQfVdR027xI=", + "pom": "sha256-H0LXSv6Df497AsgehYh11ILiqMYIpN1hEg00TjdTN6Q=" }, - "io/grpc#grpc-inprocess/1.76.3": { - "jar": "sha256-aB/LhKoNlB7MhdnEdXPywrMrhrZW5FMo0wQJ+bVe28s=", - "pom": "sha256-EqHf0MnftQNLSimP2JB5opwI4z/hEKh0EYnc3LIKHQY=" + "io/grpc#grpc-protobuf-lite/1.81.0": { + "jar": "sha256-G/YpSwmSXMaqgrH9h1BlABDkXgyIlyZwvcMTXHSqq0w=", + "pom": "sha256-YzUSGK3BUIwoUsdo2hD8WSa4k0cO4Z7MSV7LnDk73qQ=" }, - "io/grpc#grpc-netty-shaded/1.76.3": { - "jar": "sha256-KGGrwCJe8ilvMfY4SjcH0LaVnI6BvHi5zRwuHS0iIto=", - "pom": "sha256-qhT25uZBPxp6y+o6c5ISqSwoJqjjOld3UDrzNlbad9U=" + "io/grpc#grpc-protobuf/1.81.0": { + "jar": "sha256-0nSvdLdqeEYZTgJ5cI1IkAwZBw8GkkGkA0us1CkY3x0=", + "pom": "sha256-XSLUIwt+AvvBy+AFAL+YIPjrk/vNb+5+pAqv9UDI454=" }, - "io/grpc#grpc-protobuf-lite/1.76.3": { - "jar": "sha256-qvIBgWKUYG73kVQBno/Zvb0j80rFAcxqZhDZHI/O36E=", - "pom": "sha256-jQ87jfgMZIcMo0fTCxs8nVESEoARndV9Y7+rEfJ6v5Q=" + "io/grpc#grpc-stub/1.81.0": { + "jar": "sha256-lj51zGPDZZ7o5MuVZDbO/dURdh9OhaZ0yu6zBSdE450=", + "pom": "sha256-PUsDcbO7o3TKWdxUk08CXr0rsWskGnNev14ImbzMRj8=" }, - "io/grpc#grpc-protobuf/1.76.3": { - "jar": "sha256-eUVPhoZ6XsJTAcxja1U6oVvFmWkISeNAq9/FHcgX0aM=", - "pom": "sha256-dIgXFlAvg5mNlNxxpG2762KFq4Urro6rKO+W9MGpgD4=" + "io/grpc#grpc-util/1.81.0": { + "jar": "sha256-XvP1VDKevBi3ymXeFSiaz3I6JrjAvU5QL0HkGr5aNH8=", + "pom": "sha256-Ru8Ts0zzqDSsT2h2ZVaECcHpyBFUskhb2gvKrBYXzk4=" }, - "io/grpc#grpc-stub/1.76.3": { - "jar": "sha256-paXiolH6dzYkGPTL5NC1jmXTJ01HacXsiTX90GEVSO8=", - "pom": "sha256-cc7L6Zj1lTl2YkH284Z+PFXTGhpL8HjqrbizmKXciUU=" - }, - "io/grpc#grpc-util/1.76.3": { - "jar": "sha256-76vqCysb4aHE452GGYvbcTh8rjtCFjgzTzOW7JwmH3A=", - "pom": "sha256-JSHLbqqIzNKSDR5+e5AhODhQW+HfUfu1Q5Q8QGL9scI=" - }, - "io/micrometer#micrometer-bom/1.16.1": { - "pom": "sha256-Dn3lsNyQkfGy60rmv1HvdW05/PMhPbz9LIl3nXS3mvs=" + "io/micrometer#micrometer-bom/1.16.4": { + "pom": "sha256-MzctnkRE2kislUebqJKUK21O/ftHKZNcPV11MjfJfck=" }, "io/micrometer#micrometer-core/1.9.17": { "jar": "sha256-w1DP3HbAg1bxKmDoQPLb6u6nVAcS1YtUvs1sMCqGFHo=", @@ -1078,55 +1074,60 @@ "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=", "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s=" }, - "io/opentelemetry#opentelemetry-api/1.51.0": { - "jar": "sha256-7YjCh25aUlzLtW65GNeVV5e5okXxE9ULl5jRY0qQlR0=", - "module": "sha256-+BlpREGHeEhsVP4ytrKr3jnfbrlGzrp6vZ6xPkGAgXs=", - "pom": "sha256-6gZDm5dnAhhadXz8+iS8QWCj/fbKB/xphceLhB00io4=" + "io/opentelemetry#opentelemetry-api/1.57.0": { + "jar": "sha256-iLv8P8yBrzKZ5/ac3cyWcuQQ/890Nei1CkdM8uRUtBA=", + "module": "sha256-voyJqtxY6N+ikKkQM1HQapbZgAqEFGbno1SmWwopHOo=", + "pom": "sha256-JtNDol9Abj8lTm/cciYEd28H6CPvKRF60bPASTwwzdc=" }, - "io/opentelemetry#opentelemetry-bom/1.51.0": { - "module": "sha256-G2yc8yJUdi30ahrpVXZDYESr0FCpsBVyxCJcjsMiASM=", - "pom": "sha256-+m3pwICuLmOLLl8/l4Xj20QlSlfwKbDKlQ6TmZWY+DA=" + "io/opentelemetry#opentelemetry-bom/1.57.0": { + "module": "sha256-943/GSRFhXMZjnece+bv+ZxfggMS78NxC3cptL8OgZw=", + "pom": "sha256-ZfcLMUBA70UVQ7Hc5smzyGwMZyFzx43Mlk38Ga5K7sw=" }, - "io/opentelemetry#opentelemetry-context/1.51.0": { - "jar": "sha256-304wiIPvKi8oQVFAxWKZAfciI/nscTBj+TOVz/Eb9KE=", - "module": "sha256-lE8cBSwnAqmnz/jSjSJVSwjwMbrgiPrvrd3F+yfcero=", - "pom": "sha256-GyDVnq8S2i5UuQoutCP78vb1uxeLP6NyEUk6emGlfAQ=" + "io/opentelemetry#opentelemetry-common/1.57.0": { + "jar": "sha256-vsdwlUb6Eq/ikh02mFnVwNl2b/mn4ob0QSQbjmXBV4k=", + "module": "sha256-FLW9A2HJU5dC7lbJ2d0dY7PJrTU2ZLHhG6xvSyudIzk=", + "pom": "sha256-ZJTJvyNq4c9coaFLP4VEeuJDIC4g9fAEGfdoMAl/l70=" + }, + "io/opentelemetry#opentelemetry-context/1.57.0": { + "jar": "sha256-3DxrZJcMJF92Dor1Iz1IYvgpyIoKHwE1eANac5Dc0pA=", + "module": "sha256-veKUbQisbGPlgG/DSxKJwuI5VRpU96fn3tFmlPgizx8=", + "pom": "sha256-LS71BdmEG1eTx85bM+A+T64aPh+ckQrxe5xx1hChOyg=" }, "io/perfmark#perfmark-api/0.27.0": { "jar": "sha256-x7R4UD7FJOVd8ZtCTUbSfIporrgBZk+t1PBptx9S0PY=", "module": "sha256-n2xOamK43v0UFzrNt9spPQhjU7Ikkj7vYpP1gWGJPMo=", "pom": "sha256-IsF1wsGCNmdjDITnMiV2f1lwSS2ObL/7gaZXXbpHLSY=" }, - "io/projectreactor#reactor-bom/2024.0.11": { - "module": "sha256-pW8KAXASMDYjk+RjGPZlT336EZnC8Pr/uAALIxI9k2c=", - "pom": "sha256-XFDlpW7ilcH8EG1i+yD7BUVgKQToZjDLcnv8VUnYjxE=" + "io/projectreactor#reactor-bom/2025.0.4": { + "module": "sha256-2MirWYt8mqqRXnIoXeI7LMzD+QVdbca/TPaIdS7EMlI=", + "pom": "sha256-lglSINQsckFPfE9c1r26OuZdFhcdg48g0zZrFE7GsSA=" }, "io/quarkus/gizmo#gizmo/1.0.11.Final": { "jar": "sha256-pUv7ttzOkpgTRZWzzR35YbxzJGiCXybuUpbytfiMC5k=", "pom": "sha256-/9w5IIbOwtuB0m4uvTYDRxHokpwoQ1uUdpGWCFNrOP0=" }, - "io/swagger/core/v3#swagger-annotations-jakarta/2.2.47": { - "jar": "sha256-mzCzGfHDGZPmEo0i4SZSvppohYnjDGeBnthOlbluf4g=", - "pom": "sha256-yDP6F7AXZgp/p2/Lp+GmHLBrs9B3GeepeEb0CRjYWF0=" + "io/swagger/core/v3#swagger-annotations-jakarta/2.2.49": { + "jar": "sha256-P8nRK1SI+XpK0o1O7VhkI3ZX8Hfo2L0iQbJ8Alfkh+E=", + "pom": "sha256-RUu9Kkyf0YNVH4ZEdMn0GlIzjFwLAzKgkGZeRoadV04=" }, - "io/swagger/core/v3#swagger-core-jakarta/2.2.47": { - "jar": "sha256-5jt4weWwSeZnDKm7Q8PzXPNi7MCKxZp4OZSmpzKn1+s=", - "pom": "sha256-f+M3jWjP8wydRqTFmzXYp2H0yIkMziwmSLgDUc1BO1o=" + "io/swagger/core/v3#swagger-core-jakarta/2.2.49": { + "jar": "sha256-qsF6nXCVmXWBf8MuuR/uxlHRklGVd3ufHNvS+7PnM2w=", + "pom": "sha256-2wHTNEYR8CPqa0D41UAbbXu16p1QxR/Ensv6jZ0c1Js=" }, - "io/swagger/core/v3#swagger-integration-jakarta/2.2.47": { - "jar": "sha256-cLt02NeKtNSYX35TDWVLRIBnAx2ucnivj4a8FP7eEbE=", - "pom": "sha256-okwniVgLRqBbG7d4KfZzCjZwj6gRZZDAqjKwLadyW9U=" + "io/swagger/core/v3#swagger-integration-jakarta/2.2.49": { + "jar": "sha256-aZBT/erSQvHwBo3WkehMjZYT6d1txJvaGHJ83T+hg90=", + "pom": "sha256-8r5aS0TmYt+10DaS6MRHEXFHVoAi3v/ACtZK8jPfhCs=" }, - "io/swagger/core/v3#swagger-jaxrs2-jakarta/2.2.47": { - "jar": "sha256-GjZ2uzqb1Yjgqjm1ootBkQK6sXEjKMIpgFvH8KGfqRU=", - "pom": "sha256-Xa0AP7iJm7vhWbHHLm+1kC9sTllW7aqg6XKEKkcNuKI=" + "io/swagger/core/v3#swagger-jaxrs2-jakarta/2.2.49": { + "jar": "sha256-hNEu65/s4N8rnmJ8Em0Zs1j1i9yDtXVo6RWrzSnVFB8=", + "pom": "sha256-NG6/8o+0qg+ABE0nW3fttooFsAcbfrjRaBK17FrTwW4=" }, - "io/swagger/core/v3#swagger-models-jakarta/2.2.47": { - "jar": "sha256-FdEPT36sHgKo/5QLQwxjT8nf4INopU3/oyFswtyBGqI=", - "pom": "sha256-BqphK2Z1hOJ4BzxY0I8pxiasxAggvBXrPajxpEK+0IQ=" + "io/swagger/core/v3#swagger-models-jakarta/2.2.49": { + "jar": "sha256-3PrhA2LV3mNzWakfwX/c185eWYu5Upw6ZCf2mByzlZU=", + "pom": "sha256-PnXkv38/do2WutmsYIWMO6BxhW2CZol0WSEkUPp+EzM=" }, - "io/swagger/core/v3#swagger-project-jakarta/2.2.47": { - "pom": "sha256-UL3qH4opQXOIilE0IajxXHkoXGVqhSKdkcOrDs9INew=" + "io/swagger/core/v3#swagger-project-jakarta/2.2.49": { + "pom": "sha256-E/AFAsAZy44iWljSMs1/t5F8KET+rVonvzT4RzJa9Yk=" }, "jakarta/activation#jakarta.activation-api/1.2.2": { "jar": "sha256-oYepORA671hJp6+EvX4nvi0SDEEK8pFDc3X/4GH08J0=", @@ -1194,16 +1195,16 @@ "jar": "sha256-aKYh7BhIX5UdCax29D5X7uOU2+QsuPKkxZyTKW+p3MY=", "pom": "sha256-Gs08hdTP48Sa4eKsKXdCujnaW7swo60OQXbqbGNI/O8=" }, - "net/bytebuddy#byte-buddy-agent/1.17.5": { - "jar": "sha256-xbkzStguYy9q9g3yK7vbu2LO4Eh39PQ8OLoErtm9mQE=", - "pom": "sha256-C4NIL7Ujtb+UdKqCp8XTzhPPOlqatdY6zpVZGfbXzBQ=" + "net/bytebuddy#byte-buddy-agent/1.17.7": { + "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=", + "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w=" }, - "net/bytebuddy#byte-buddy-parent/1.17.5": { - "pom": "sha256-HoN1gn7n0vXkxwyzHJFn7OxgaTz2pbdzoeZv1NJnU2c=" + "net/bytebuddy#byte-buddy-parent/1.17.7": { + "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw=" }, - "net/bytebuddy#byte-buddy/1.17.5": { - "jar": "sha256-cVaMn4OWZ3IZ9lAmj79kk97UhO3NvfLa5hKcpb6B6Ns=", - "pom": "sha256-U81D27NbSORHJc1XbSAG4fcfIWh9BA94DMcKCn79QcI=" + "net/bytebuddy#byte-buddy/1.17.7": { + "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=", + "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M=" }, "net/java#jvnet-parent/3": { "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" @@ -1320,29 +1321,29 @@ "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" }, - "org/apache/logging/log4j#log4j-api/2.25.2": { - "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=", - "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=", - "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM=" + "org/apache/logging/log4j#log4j-api/2.26.0": { + "jar": "sha256-gg3nu69DDq8uPlzLkvI+IIV5fFrE1Pf8bItmD776Hbw=", + "module": "sha256-oSTwJk9jCkX7b0GfRhR0KXi1tRco8J5kAwNfHWPcTCE=", + "pom": "sha256-pLhyPB5gXu3Cs5bdtTL6BhryQufi4mmOytUCsMNcV7I=" }, - "org/apache/logging/log4j#log4j-bom/2.25.2": { - "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw=" + "org/apache/logging/log4j#log4j-bom/2.26.0": { + "pom": "sha256-1K8Y0C3O/GV/Wkl/M5wUuf3lVGhsfIHF+Acr4WXbdXg=" }, - "org/apache/logging/log4j#log4j-core/2.25.2": { - "jar": "sha256-5Q23cBQw/5B5gYUO9SekHVGlPdABf1Oghgr8urhXAnc=", - "module": "sha256-JRQSc3eFDwR83jJbc7efriEzKSK+tkmiUzr9CEIlihE=", - "pom": "sha256-L/9GPTmclAgtmCLCG/v0cOEFHbt9S0XyWw54G8Xg9BI=" + "org/apache/logging/log4j#log4j-core/2.26.0": { + "jar": "sha256-QGuzEyxHpdMi5cVx/rB4fKhElkafNG61Hx7y7kVJmQI=", + "module": "sha256-l9KA4YMBLdiYgQpxdqI4EntnyCUX7CvUXCPEHOB5kLs=", + "pom": "sha256-pAJ6Ewgiftxul2LUHNIAqueglUL917rrR6l0EJ5WduM=" }, - "org/apache/logging/log4j#log4j/2.25.2": { - "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w=" + "org/apache/logging/log4j#log4j/2.26.0": { + "pom": "sha256-5fqx/dFG24mAzuDdE4P1+vinkmYG+si9qpv+8XyY1cQ=" }, "org/apiguardian#apiguardian-api/1.1.2": { "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "org/assertj#assertj-bom/3.27.6": { - "pom": "sha256-Irh92pqrg/odDz6kCbUk56RJIc+PX4eZnPWQRvD+C8M=" + "org/assertj#assertj-bom/3.27.7": { + "pom": "sha256-HAn2wEyQXh5c2yLV36XxGkluGeiB3ghQtSPtU6BRn1s=" }, "org/checkerframework#checker-compat-qual/2.5.6": { "jar": "sha256-EdE0skXpysxHRRTS1mtbhhj4A5oUZc3FW7wLNOAAi3o=", @@ -1358,15 +1359,15 @@ "module": "sha256-YA0Z+9XjfemEh8OYBF4UCmUc9brRx5xcl88MyYRMQuQ=", "pom": "sha256-yEUftI7+1jgbMpFG1PrvtvTYq/E79XLCaosawoCW54A=" }, - "org/codehaus/mojo#animal-sniffer-annotations/1.24": { - "jar": "sha256-xyDm5by+ay9I3tdaR7zNt2Pu3nnRQzAQLg01Lj2J7ZI=", - "pom": "sha256-iEhPYKatQjipf+us8rMz6eCMF4uPGAoFo+2/9KOKg24=" + "org/codehaus/mojo#animal-sniffer-annotations/1.27": { + "jar": "sha256-z9flGoKP5rmLwNu5njSQDJ6QEjIsud3Vf9jdCwLaXic=", + "pom": "sha256-5Za+JH8tPvlDvmXtsMBTNNGZb+1f4P5VGP8ApQsox2k=" }, - "org/codehaus/mojo#animal-sniffer-parent/1.24": { - "pom": "sha256-Sd2rQ8g2HcLvDB/4fLWQ+nIxcCq59i4m1RLcGKHxzQQ=" + "org/codehaus/mojo#animal-sniffer-parent/1.27": { + "pom": "sha256-aAJgqLlBEewvzUOShzkf3EA0ApK6LjFn+L7w15cAPOw=" }, - "org/codehaus/mojo#mojo-parent/84": { - "pom": "sha256-L+UQYYsvYPzV8vuCvEssLDRASNdPML5xn8uGgp7orDA=" + "org/codehaus/mojo#mojo-parent/95": { + "pom": "sha256-T98apG0ftyLhVQi07et7ZRNExuKXdM0rdsvsOoTCOhE=" }, "org/codehaus/woodstox#stax2-api/4.2.2": { "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=", @@ -1399,45 +1400,45 @@ "org/eclipse/ee4j#project/1.0.9": { "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" }, - "org/eclipse/ee4j#project/2.0.0-M1": { - "pom": "sha256-GGpzaiANE3/mHNM2ANNEUBqsCzVspfHOR3PlhsDJRwc=" + "org/eclipse/ee4j#project/2.0.2": { + "pom": "sha256-u3XRp9b+0FWVGEblmCIl13LW3sDxvYrl2nlIuwt+trk=" }, - "org/eclipse/jetty#jetty-core/12.1.8": { - "pom": "sha256-iUrAFn9p/BOSFP5qRu81Vuoxu67IrgWPY3uc8x4m0io=" + "org/eclipse/jetty#jetty-core/12.1.9": { + "pom": "sha256-r9UO4FZ0xU+t2nrR7NquKIW/zZUk7mZCRZ/hlzdbGRc=" }, - "org/eclipse/jetty#jetty-http/12.1.8": { - "jar": "sha256-MsNRmE/XTn25sxIPeqQ8A0qdf+KQOGdH/zGPTEIh2Us=", - "pom": "sha256-DCi4i54+S05kI8zWJjcd5ykHaYNLOhw1YHMtXiaOhDQ=" + "org/eclipse/jetty#jetty-http/12.1.9": { + "jar": "sha256-hX6vXngj+e6RCZ21vt0Xm30+k2U6wojicyFUQjEBTfA=", + "pom": "sha256-FWo4BBTUpZ2ds0V0tD6lHPoAe2JY/GdCKl80LYSYN/k=" }, - "org/eclipse/jetty#jetty-io/12.1.8": { - "jar": "sha256-xFpozu01JvXKCXR2jKph9mg8PVWRqBn7zzwEgKZKskU=", - "pom": "sha256-dVmajLMrSwvAKolDr10y0QeSztMpVZRenwzn+VvWcjo=" + "org/eclipse/jetty#jetty-io/12.1.9": { + "jar": "sha256-kEwWgOdHBXlMFfnfKpzPsVUVK90wZ1If1lIt8Am/qdk=", + "pom": "sha256-wvDbPhLrX8VyiTjRBDVfyPjAgxSCmS+9cjWSvmXDjLk=" }, - "org/eclipse/jetty#jetty-project/12.1.8": { - "pom": "sha256-hZ8clGmMGVBcFDzh4h9D8pQhcBZlvDNU38LXBao6gpI=" + "org/eclipse/jetty#jetty-project/12.1.9": { + "pom": "sha256-DTLtTUrelkjaB0MvKy2hR9fIdw8Kzp8rtdjMLtR0FgA=" }, - "org/eclipse/jetty#jetty-security/12.1.8": { - "jar": "sha256-RK3Z7pW5Vdlpecx04y7HUeqAfrwPUTnrE63PwjcSxY8=", - "pom": "sha256-OLElGts7MltXZLOH6jxQH0r9k41uphOuLJicgphCZ8w=" + "org/eclipse/jetty#jetty-security/12.1.9": { + "jar": "sha256-ANzT+SWNfrQfwcHLy6ozoaR3EHg+MK1RKBbwwFFCMUI=", + "pom": "sha256-KzRMG5YkQtZmc6xsznS55bbG4SUvSSHRfYEXX/lXASo=" }, - "org/eclipse/jetty#jetty-server/12.1.8": { - "jar": "sha256-cbiGKnIwWuu2WQm4ufPJoMeQ7zJFxgVuVrSBF67COP4=", - "pom": "sha256-w2I8/+mzl3IWwg10shibqFxpvDDv2Yy/jcFxGnweBRU=" + "org/eclipse/jetty#jetty-server/12.1.9": { + "jar": "sha256-Xfw3NgVs2UGng7IeUMmDwjXBsKWT1LDSlUlmFzo/aj4=", + "pom": "sha256-p2+tFTOu3VMVqMGipmta81MkLJYlXxKOpJGjemtHhkM=" }, - "org/eclipse/jetty#jetty-session/12.1.8": { - "jar": "sha256-6+hN1BlC163aX30TBAldJ055FZmUUdhI6IfL1An5R+o=", - "pom": "sha256-Lgkr5cJPlt57w+0YU3VQLFzF4hASyNoOViovqZUxKaQ=" + "org/eclipse/jetty#jetty-session/12.1.9": { + "jar": "sha256-EhqcLJunJ011H+Pg1UCGEslbRt8u0gkQz+zO1a57Flk=", + "pom": "sha256-v39/qozGpNU+B4BYNmr9maOYKP8gtQ5cJxGa93wbTjE=" }, - "org/eclipse/jetty#jetty-util/12.1.8": { - "jar": "sha256-AEMnFfIMPdyNT+OwGXQlOndy8YMPdxLaca8wNIsByCI=", - "pom": "sha256-2ttvRP4IoAh3i2Lz/46UQxAsQGqWXXer1OFmlGKKIg0=" + "org/eclipse/jetty#jetty-util/12.1.9": { + "jar": "sha256-uyKDWNSuRcAE2Untw5feHriqvHrcX5ucvIMzNucKI70=", + "pom": "sha256-OiHk+TJOVSySXYDYoHGc32gvKjD4RMSMtwlNhLlL6gE=" }, - "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.1.8": { - "jar": "sha256-xiUfquJBsraHnOj7kXc2bKR5P/k1b2B5O40QofH+9AQ=", - "pom": "sha256-43vjEy+ohTjxLH4wyv46tCZMFNI1Cp28jHp5XLmSPNE=" + "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.1.9": { + "jar": "sha256-cnXUveew55CSm/ujDvssE89Os2JL8DAU9NEjNmoRaOc=", + "pom": "sha256-7UO6VWIVewVIQbUhGBIp9zI/eXUPmOY6F5FtGWhuZjo=" }, - "org/eclipse/jetty/ee10#jetty-ee10/12.1.8": { - "pom": "sha256-dbgsGIAnJSZ2lh0VdW/S4ZO7dA1aXlzHyI83TilevYs=" + "org/eclipse/jetty/ee10#jetty-ee10/12.1.9": { + "pom": "sha256-gP+OudwLk1Eg9qWLWofHUMCvxDBx43NO/fvOgBD1V+E=" }, "org/eclipse/parsson#parsson/1.1.7": { "jar": "sha256-wh2wGPisbPeYk/Gvd/HNM3k3vRKub6PUsQ9aAIGe5Ww=", @@ -1479,83 +1480,83 @@ "jar": "sha256-ZcCruUbSqzoSN8YQ8kvxXwRpYVHpyvvhr6bO5S++1e0=", "pom": "sha256-V9aw+yZOT3V7k1nvKC2cmXhG74JSSlA3Kj6GN8WKYe0=" }, - "org/glassfish/jaxb#jaxb-bom-ext/4.0.7": { - "pom": "sha256-WjlgZhzu99sPfohDSu5y90HJ7JCzYbz7NH3WOqKAjWM=" + "org/glassfish/jaxb#jaxb-bom-ext/4.0.8": { + "pom": "sha256-6ESpnoa32YNk9gAHYS8fv6T069eONF4aujZY9vDvbzg=" }, - "org/glassfish/jaxb#jaxb-bom/4.0.7": { - "pom": "sha256-97VFomqCDe1lZWKEf+rTMd9+DM8okww4JIGgcMn25b4=" + "org/glassfish/jaxb#jaxb-bom/4.0.8": { + "pom": "sha256-FyRwUOLbTdcd0mhgCQIutE//sLxeNxqaGMW/eYj2QCc=" }, - "org/glassfish/jaxb#jaxb-core/4.0.7": { - "jar": "sha256-8pr1w3WSw6BqkS2ozfHRYDbmym1O7Zvm92cOYPpGZgE=", - "pom": "sha256-2OukbNXEQeoj8WiPh7CYbPD2sVdn5fcT7s5sDTIggCY=" + "org/glassfish/jaxb#jaxb-core/4.0.8": { + "jar": "sha256-pqfMeGUXkQvDK5wkS+WfxlBeTUvQAHswtZlxqCbckNc=", + "pom": "sha256-nZzskwRMedf+KNrBr3xBaVE6rVS09Yiz6CQ3HmNlqhc=" }, - "org/glassfish/jaxb#jaxb-parent/4.0.7": { - "pom": "sha256-S74O8mgwHn9LGOIJfdUrHQLeB/DJ1osJsc6SegYxtyA=" + "org/glassfish/jaxb#jaxb-parent/4.0.8": { + "pom": "sha256-ekGNM50dgSxSbzw6rhICjrLEtVn/RmmmVtfZqjPYFng=" }, - "org/glassfish/jaxb#jaxb-runtime-parent/4.0.7": { - "pom": "sha256-RWIGwFEC/ZavVfVWO6fOjTIq8IpOca/mw17t0WpZAJo=" + "org/glassfish/jaxb#jaxb-runtime-parent/4.0.8": { + "pom": "sha256-ewMP0m18WOCKhUwbOhqhyszQTGaapduSYZn9c1M4izg=" }, - "org/glassfish/jaxb#jaxb-runtime/4.0.7": { - "jar": "sha256-YaXa9aGYf37XFJxaiD3fIgypv3FKjYz/yF+sMB6StfI=", - "pom": "sha256-jcspvdeVXmD2W9S1RphivG+4W8+Gqci2hNPI1yr8C60=" + "org/glassfish/jaxb#jaxb-runtime/4.0.8": { + "jar": "sha256-vSiobiX68OjlCEx1CKoTPgS6Y64eUw5bZYV3yKVM3ZQ=", + "pom": "sha256-7KKuGDQouvxIphNgqHyeowLoCiLW9AbUQTOkwPgW54U=" }, - "org/glassfish/jaxb#jaxb-txw-parent/4.0.7": { - "pom": "sha256-hc9OOlkQCgnTXCBjjdDxrsOF28IZUk68118YeVehzTQ=" + "org/glassfish/jaxb#jaxb-txw-parent/4.0.8": { + "pom": "sha256-AF9cxMD8Lwsi5XC2a979P8JR9EEtNXK7sQnv3j1ZXao=" }, - "org/glassfish/jaxb#txw2/4.0.7": { - "jar": "sha256-xyVnbyVQyqP1eUPy0Q36x+FMOrs0pqnYmsfrvxveMmk=", - "pom": "sha256-7LKAZJeJ3TDHbGSkyJGAWj1eMCa6wP3LHKRPmlGlCvw=" + "org/glassfish/jaxb#txw2/4.0.8": { + "jar": "sha256-y125snzUPkW8qRmsO38T7ruj4JFslCpS9PN/6nS6ffw=", + "pom": "sha256-yIx7fj0N+2sJz+ibciHgkyIE54MnadDCRM3cssDHy8M=" }, - "org/glassfish/jersey#project/4.0.0": { - "pom": "sha256-AxgU8a/mE6OUS5+K/ekHabew9cTHZ665fFopnV+mvxU=" + "org/glassfish/jersey#project/4.0.2": { + "pom": "sha256-B+gRzkC/ePfHJYgDYvynnpWpg33eVof/w4l3Faxunc0=" }, - "org/glassfish/jersey/containers#jersey-container-servlet/4.0.0": { - "jar": "sha256-ckfY37DUlQmRaQWAYGxa2TO5F8an/oW1JW8j8oeCTA8=", - "pom": "sha256-V1zTMUcq1HkWWuVDODpFUoCJ8RVba/yI/WsgDkAq6T8=" + "org/glassfish/jersey/containers#jersey-container-servlet/4.0.2": { + "jar": "sha256-kxe0ycyPhpBv5vZLKuYT17WG1/s5bNE+r2FaLVuxQq4=", + "pom": "sha256-6tycCeiC34zEmS8owR+/WEIxwRIgUGLHGdOCeLtxKt4=" }, - "org/glassfish/jersey/containers#project/4.0.0": { - "pom": "sha256-P0Q/lOWOho6LjY/aaLcLiSTgSXEao9PMM12z2Q4MwsE=" + "org/glassfish/jersey/containers#project/4.0.2": { + "pom": "sha256-pnhynmlvK8EF9ZSaurx/OMOWV5CqdTMtvMoz+a1qRak=" }, - "org/glassfish/jersey/core#jersey-client/4.0.0": { - "jar": "sha256-ng3FA4bcY/jqaNkW3OVeogSmSAl4W/k1dp38Ew9maaM=", - "pom": "sha256-Em+B58WqDE5cQyjIBW2aTIiYzaLG1c/7yYDj6B3OUPE=" + "org/glassfish/jersey/core#jersey-client/4.0.2": { + "jar": "sha256-kf2YbufH+kaLL2Adeizfm/rWzk+g+/XU9+bQwHwSoCM=", + "pom": "sha256-1C4C60t/kOfB1Qb/4jn3M1mLOc8xIS/wYk3Onbjtb6M=" }, - "org/glassfish/jersey/core#jersey-common/4.0.0": { - "jar": "sha256-H5/ES2basv+CkfTHCSqn4LObs+/hu/UM5poy+gl5ZhY=", - "pom": "sha256-LmkrASQngfxhm6CxdtWE2VAw267AfEDG1//FVb6xr5U=" + "org/glassfish/jersey/core#jersey-common/4.0.2": { + "jar": "sha256-g0ZoFcRtj4E1CUEZhqItHToqvlcrFbAwePmLwCAVRTg=", + "pom": "sha256-w17tpd9dtVkzIjOCNwlS06QcdGHLpAWBOC5o29YNojI=" }, - "org/glassfish/jersey/core#jersey-server/4.0.0": { - "jar": "sha256-ZPQgKGYxe+xYDCtl5C5/I3HBC/cIWvYTwwyLQQI0Abg=", - "pom": "sha256-HwcEUUOi9xKWboWKwuU6T7lTeqWOZAy7a+A3ONP228M=" + "org/glassfish/jersey/core#jersey-server/4.0.2": { + "jar": "sha256-ySAww21rcs6lNGT5VOIyYO0a01Wcu2UyZEl9g4gqmro=", + "pom": "sha256-9D599HF68zkv1jBRCrhfJAZAHjh6yItydQtfcsLO7T4=" }, - "org/glassfish/jersey/ext#jersey-entity-filtering/4.0.0": { - "jar": "sha256-IJfOHnbNEnfhFyW4Zvim2cFDB67RI61j1NLGJj4EZjc=", - "pom": "sha256-EFsMA2JzfAt1wnRJTBrZdEjnXS9tCLuZfayF2jcfI5w=" + "org/glassfish/jersey/ext#jersey-entity-filtering/4.0.2": { + "jar": "sha256-Yzr79fPBrlOu/77B9IaoeERvGeyN9CsveVywZiDR25A=", + "pom": "sha256-YhJQqmeiWlDVSDUbAAPvkYbN23FUJAVhiPfSEbm33uY=" }, - "org/glassfish/jersey/ext#project/4.0.0": { - "pom": "sha256-duMWdMfq4DLYfQINAxps1J7QJvUhp8I/3sgMpOlBTNw=" + "org/glassfish/jersey/ext#project/4.0.2": { + "pom": "sha256-3fSasEBmXGw/fS91lOhoe+EXyhETFVG9Rl7ucilPDd4=" }, - "org/glassfish/jersey/inject#jersey-hk2/4.0.0": { - "jar": "sha256-cZdRkWdrvjicm6EUrhlGyXFBmMrJnL3vVq2+s9Yip0E=", - "pom": "sha256-4DauIN1e9qyVr3h1K9jXVNqIwcKlbQwHrC7k+bha3nc=" + "org/glassfish/jersey/inject#jersey-hk2/4.0.2": { + "jar": "sha256-XfdY/FXQ1820MbTJq1D79hOWXOCniY0akj2VfjqT3yw=", + "pom": "sha256-WV8RMvMjuGDVjMPXpZ4SfWylhBFmIpenKXLKwyb0CN0=" }, - "org/glassfish/jersey/inject#project/4.0.0": { - "pom": "sha256-KxCS7+A0OpDAuAeAUVD8HabmyIfNmw0gUqs+vZhJYeE=" + "org/glassfish/jersey/inject#project/4.0.2": { + "pom": "sha256-MGREt4Srk+g+PzflejKAeGEPKY1k6QSLCyKeknnZ4zo=" }, - "org/glassfish/jersey/media#jersey-media-json-binding/4.0.0": { - "jar": "sha256-c2FYn9mWMPX7mz3ZFoSZVXOcMFYz77YO8sstM45jvpQ=", - "pom": "sha256-yGVYmv2SEdTz9eqyk1k0QBra+Htsc8ntLaY17cIBLg4=" + "org/glassfish/jersey/media#jersey-media-json-binding/4.0.2": { + "jar": "sha256-AB4m2jHPJfRhE6923/Qy7AxvBhXugdpMxDP9Webh9Wo=", + "pom": "sha256-93G1a+Drl+y9eRB22MiAkDElNE9aeLRfZpE+qsjIPs8=" }, - "org/glassfish/jersey/media#jersey-media-json-jackson/4.0.0": { - "jar": "sha256-NjmDetiQNtO//eHJLb7Dfat53bHnZgtGiAXpIQi5QlI=", - "pom": "sha256-Xn+km+FJUOyIcTe5is91+CIjwfI7Dnug9dXaM4unBAY=" + "org/glassfish/jersey/media#jersey-media-json-jackson/4.0.2": { + "jar": "sha256-76L9rSbplK3eT4J8EeRKtf0888Pgqk+Z6O79G4NEn6c=", + "pom": "sha256-p7O+Bm28suQjltEFA+3BAHYzAIypFdQYKrxGxyXzD2A=" }, - "org/glassfish/jersey/media#jersey-media-sse/4.0.0": { - "jar": "sha256-J52UNizQ8krqYemOGwuZ7zwbwrtY6rDORiD6I2RgWeA=", - "pom": "sha256-YoejQ3v1jRPVe2Enp73s638f5tRRZiWNrMMrSKx3pHU=" + "org/glassfish/jersey/media#jersey-media-sse/4.0.2": { + "jar": "sha256-lrE1Nu5PVi6UcLrMJ8Xm3lK6ms8MubFYKdph4ElkVMk=", + "pom": "sha256-oind4205KTBXv1guOAndk0/5AoDZhd+aW8/JsNxjuXM=" }, - "org/glassfish/jersey/media#project/4.0.0": { - "pom": "sha256-e4ZcegGG5BiqMEipkySzRMxhM+WptxAnGOLvSFIHrX4=" + "org/glassfish/jersey/media#project/4.0.2": { + "pom": "sha256-GHqOg3tV41BQZUIh56kT1Zy99gUPssg7tTLvbREmNO8=" }, "org/hdrhistogram#HdrHistogram/2.1.12": { "jar": "sha256-m0f7rkRP6qxLfgTw6ilFaeS8KCvGnYws4qw/I1dygeI=", @@ -1586,26 +1587,43 @@ "module": "sha256-W07rjbph51OBYVPgxz9WKyDgF+OTk5UtTeTdMbdyYLs=", "pom": "sha256-+NxQzzqsS87HQKkJVfKADkElHpxANjC3W3UtO271vuI=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.2.0": { - "jar": "sha256-svdD6luhL2ng815djUYGnXTI4oYQh1SKfg4Up4S8TPE=", - "pom": "sha256-FqFd0ZfPJBNJT3iMuWFE2aFGJnw9b38cFbejweBSNGo=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.3.20": { + "jar": "sha256-l2+YnQtfXYDo6KitS3PaC/wn/dllufo4Nisr557MEzc=", + "pom": "sha256-DDWu7jcvB1FOvtN7lAe44RgdFCd1UTnlzudxnKBf5+g=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.2.0": { - "jar": "sha256-omzI4thhkZfMTRFb6ndm6aqODx54duoETuG58wVlRgE=", - "pom": "sha256-vSrk4skWBWVKilUn2nV/KyJ2WA0fXq6+q9M0OvjVxGc=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.3.20": { + "jar": "sha256-iHC6uEC4CHyWxN3AYIi0rt9RMcQIrzZ0MGME8flq8/Q=", + "pom": "sha256-YVQOWzoywLEZYkSWZZJMbNdVTqmu4IVb2OT1t/YQoKs=" }, - "org/jetbrains/kotlin#kotlin-reflect/2.2.0": { - "jar": "sha256-Iw2RwuQQ48/KOk3HPSVUVfYv9SqsCRozOXpuML3pG/c=", - "pom": "sha256-3u2DHvy2Y+TPPVEh5a55byAeN7gT0sfWB7Xx+Khv5S4=" + "org/jetbrains/kotlin#kotlin-reflect/2.3.20": { + "jar": "sha256-40b6PD/0RR9fcHoxKIf9TIVV2kjMFfqdsrqTwz+J+BM=", + "pom": "sha256-iwC9L+srtVON85aVQXTZ3cDsVA00ElhjA1ObHpZVwzM=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/2.2.0": { - "jar": "sha256-Ttl/0eDJux0JSO1eY8yRRWMTpZUYKVuSssFRSu9VYVA=", - "pom": "sha256-5QdIv0Z09lRgPnsbuDBjTsmevZwzDeukytzuwHZ8u1Y=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.3.20": { + "jar": "sha256-b8232m5lz4zEPlqrq5S9zEiCXnkzaG+KG/aU64j44A4=", + "pom": "sha256-ZgmWdnA6CB/ZrEMTlmWIPlwUUCC2QHWd4FOdiRb/JH8=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.2.0": { - "jar": "sha256-ZdEthaO4ZcFg25FHhRcSpksQ2t1osi7qIqlb+KhnDco=", - "module": "sha256-pbmP3NnbAX1ULhlyJdzuGNZYpW3h2yzEHhMZbWsXaaQ=", - "pom": "sha256-jDyCEAfBNBFVhzm589U4LrgVUds4lc/7iVYeVsD03BY=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.5.21": { + "pom": "sha256-v4t4ZayTWUd1D0MNS/zFzRyunE2CajZDIFpWt8MT/Lg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.0": { + "jar": "sha256-TIidHZgD9fLrbBWSprfmI2msdmDJ7uFauhb+wFkWNmY=", + "pom": "sha256-36lkSmrluJjuR1ux9X6DC6H3cK7mycFfgRKqOBGAGEo=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.5.21": { + "pom": "sha256-gsZSmUwC7jzyem2WYamabSsISkqXIqB/OrrsqtszV6E=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.0": { + "jar": "sha256-BbYoBEQbDJoZILa31c9zKaTiS2JYR44ysfBGygGQCUY=", + "pom": "sha256-K7bHVRuXx7oCn5hmWC56oZ1jq/1M1T2j/AxGLzq1/CY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.5.21": { + "pom": "sha256-1pWpUhukRFiLhsTtlhAigxkbIn+b7mYpQbxh9mau10w=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.3.20": { + "jar": "sha256-CuElBKUEDrrzdwOQhINCDRpWJN0dk/NXZl+Md8hIoB4=", + "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=", + "pom": "sha256-yDwC2afi6VRzBJHDPC8dwDwnZi4ntWbsK0TS0Bhjm5g=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" @@ -1615,8 +1633,8 @@ "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" }, - "org/jooq#jooq-bom/3.20.10": { - "pom": "sha256-uge7JqEpuey8uWsvi2XHhNxbDFGkjIETPpeyl6f2m48=" + "org/jooq#jooq-bom/3.21.1": { + "pom": "sha256-d8xEW2KWx5IiK5AEzd8XEYbSa9vOOWcqs9jEazb+dqg=" }, "org/json#json/20250517": { "jar": "sha256-PqYbKgbjHt8ckRNP6RBrDrsWYovhafPbdbx6Kwa0V5Y=", @@ -1639,14 +1657,6 @@ "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" }, - "org/junit#junit-bom/5.12.2": { - "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=", - "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc=" - }, - "org/junit#junit-bom/5.13.2": { - "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=", - "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k=" - }, "org/junit#junit-bom/5.13.4": { "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" @@ -1655,106 +1665,106 @@ "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=", "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ=" }, + "org/junit#junit-bom/5.14.2": { + "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=", + "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8=" + }, "org/junit#junit-bom/5.8.2": { "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=", "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI=" }, - "org/junit#junit-bom/6.0.2": { - "module": "sha256-CXdtx1DgfltFk690n/aPkYB/nFTDMHUcn0tPHqZScdY=", - "pom": "sha256-w1iXvlPvCDmGw/CRGt53SctCrrQAyZH7ruUeRjn3uak=" - }, "org/junit#junit-bom/6.0.3": { "module": "sha256-KA48NIVfKhPeJBIZN+TPl+S565IG5g+JHk8KHPDnq6E=", "pom": "sha256-plW2pdwA0b68kfsrFcDH6K6snWvc+HlZVQU3DidTAoc=" }, - "org/junit/jupiter#junit-jupiter-api/5.11.4": { - "module": "sha256-puov77OqWGj9engK4doRYudt2jdgtIAVwqQZ0jcv88s=", - "pom": "sha256-US0j/znHZmWho2RVJiMLz4ib1JiEME9/6+BHsBjuszk=" + "org/junit/jupiter#junit-jupiter-api/5.13.4": { + "module": "sha256-/kZNN/XIEKgF/zGRmBZcrDPCVY4iYQIdjzEqglpIZx8=", + "pom": "sha256-xWBTV9MRgTZCxABEHgR7ynF8rcFXs/5+GJhbxv8jLls=" }, - "org/junit/jupiter#junit-jupiter-api/5.12.2": { - "jar": "sha256-C5ynKOS82a3FfyneuVVv+e1eCLTohDuHWrpOTj4E8JI=", - "module": "sha256-VFfyRO3hjRFzbwfrnF8wklrrCW5Cw1m2oEqaDgOyKes=", - "pom": "sha256-VmKCFmSJvUCxLDUHuZXkj44CXgmgXn0W3SuY3GQs994=" + "org/junit/jupiter#junit-jupiter-api/5.14.2": { + "jar": "sha256-cEzaGFcxa7eRGZsaG/gXOwd4uTioRFyFvhFUxfiBOgo=", + "module": "sha256-Cw9Y0AG0zPQduv9mL/CPBGQLn1FWshXS3FfO6TaS6CY=", + "pom": "sha256-NXvqCt8V4DrCyOrfIEW5NCUPr4SAlAmWNZm89HXeszg=" }, "org/junit/jupiter#junit-jupiter-api/5.8.2": { "jar": "sha256-GAjuh+D3GM1uJfO3WvwXlWrIo+3EjH6bq58Z+aeeOAE=", "module": "sha256-fpr03/9iZ6zd0VfZ4Rug1dyRszL6dLxMZZOeRReht3A=", "pom": "sha256-yb3jYieVswp3NTHoXFgy+NyKp37N0xPu4jXJg8v9Anc=" }, - "org/junit/jupiter#junit-jupiter-engine/5.11.4": { - "module": "sha256-25EWOorwBaMnmFZd1nU3clGJWQ3qttoDsx292kVoahg=", - "pom": "sha256-sKMjsNA0REQdE9RjC0DbXvhBYNLC9YXU1kbcOIL5kgc=" + "org/junit/jupiter#junit-jupiter-engine/5.13.4": { + "module": "sha256-zu7m0ANKc4E1vZ84IM/gicZWkWPGI7qOPptE9yCP0ho=", + "pom": "sha256-E4Nt6C2Xf/JSCPXgypvfEzFV3C7+0Wr2Dfrojp3KzUc=" }, - "org/junit/jupiter#junit-jupiter-engine/5.12.2": { - "jar": "sha256-9XbAa4rM3pmFBjuLyAUmy5gO7CTe4LciH8jd16zmWAA=", - "module": "sha256-0W0wjmqiWjCz75JNnf5PiJqb/ybqvXLvMO6oH864SBU=", - "pom": "sha256-PHGRdFCb6dsfqBesY7eLIfH2fQaL5HHaPQR4G9RAKqM=" + "org/junit/jupiter#junit-jupiter-engine/5.14.2": { + "jar": "sha256-Ak2bBtMbkPucWnwLxiz6LUnGc6aKenW+m1JUi6YoNQk=", + "module": "sha256-VB9i/FQLJZxofAveUbVBhLcvlGJIpA6C5J9kVXYSsGU=", + "pom": "sha256-2j/YDMHhYiWQKIDDwXB/O4laEdqcYjMISgSzlcDh/QE=" }, "org/junit/jupiter#junit-jupiter-engine/5.8.2": { "jar": "sha256-dTt3Js3RWLs0ztuUwWHiKRiW9HgyoentpT2XACCoGE4=", "module": "sha256-pWIExxbCN5lwyo4/4qcuOgMM2QJzKNPOFFfdEMAVDn4=", "pom": "sha256-Ckt92UuvnF+7ZaLpFz0IUii9ACQhNkgCWtBnAk8cZrs=" }, - "org/junit/jupiter#junit-jupiter-params/5.11.4": { - "module": "sha256-WIZbi0uZi5qxnBP45BO34dSBk3TdXfaXYMTAsLxOmJU=", - "pom": "sha256-jDWbvqB8ZKas3YweE7T3cFiyQys16G6ald3GMkmgrVQ=" + "org/junit/jupiter#junit-jupiter-params/5.13.4": { + "module": "sha256-/DZvvmB5ma/IzwK53KldHgKgawzocqRWBanZaMJG9LQ=", + "pom": "sha256-wPNik+IEJzLWJu4HWMrlLDeMKklXnUW9CBUojyDdTGw=" }, - "org/junit/jupiter#junit-jupiter-params/5.12.2": { - "jar": "sha256-shn/qUm5CnGqO2wrYGRWuCvKCyCJt0Wcj/RhFW/1mw8=", - "module": "sha256-x3KP8z0SJgBzLq09DW+K3XRd4+lEFRmHE5WuiZymFHQ=", - "pom": "sha256-pcfvF8refV90q2IHK7xrxxy9AWgGJGvOQl/LvBEISTw=" + "org/junit/jupiter#junit-jupiter-params/5.14.2": { + "jar": "sha256-BthnOrFhdBF+uup8ydwIgJ23o5T12T79JANi2IPQHfA=", + "module": "sha256-9VHVeJrqNQzfsYFkyp2a/1bgyYIsfG32HTF3ZL6LQA0=", + "pom": "sha256-CuKLm95MW9YCVeCb7vGRXAfvL5gdO49HyLSIeVGJFuY=" }, "org/junit/jupiter#junit-jupiter-params/5.8.2": { "jar": "sha256-0cItb+VINWjAjIkT80q9IwNJDDSAzmwYouoxxl5EECo=", "module": "sha256-UCPk4+wVbsa9PPZV8wcM/Fo+iq1dUbS74CWnkulJjXM=", "pom": "sha256-tGngEBcBfYW8AlIlMCBS+kXPK1n5QVhCRzlGtPpJx8Y=" }, - "org/junit/jupiter#junit-jupiter/5.11.4": { - "module": "sha256-o8NT7XUWrhg16rlaCH9PCaWwzH0LiwOf53oDm4q1IQM=", - "pom": "sha256-qGLfEe5TmYLvyxQdnArecDe7oCZdC1idX7hNsNIS8dk=" + "org/junit/jupiter#junit-jupiter/5.13.4": { + "module": "sha256-RpRiJ8KWfRZZ6VX1PTTshzGBHUr0AcKsfWRveTx44fk=", + "pom": "sha256-q3sscJnzXPorMVmhpaQLlO414hKyWo172XwSJ7+u5Y4=" }, - "org/junit/jupiter#junit-jupiter/5.12.2": { - "jar": "sha256-OFSzrUNJBrgn/sR0qg2NqLVunlbV/H8uIPw/EuxL6JQ=", - "module": "sha256-ioIpqKD4Se/BzD/9XPlN4W6sgAYcX5M5eoXAk8nX6nA=", - "pom": "sha256-ka2OSkvzBCMslByQFKyRNnvroTHx21jVv+SZx5DUbxc=" + "org/junit/jupiter#junit-jupiter/5.14.2": { + "jar": "sha256-7gTJsMUyE2pLxKhTH+VKIsY3uTppC8BkcYNXWE0eca4=", + "module": "sha256-yjO7T4OBTaS6iffR9w0zNieo/Pab5G2cf9973XACpr8=", + "pom": "sha256-6IK8iSW+9JsonGrn/GcKd0zmT3eer9dHuKo9ioqGfjo=" }, "org/junit/jupiter#junit-jupiter/5.8.2": { "jar": "sha256-T1wcxkMiRM0W42qg4Ct0vONKgf+VoT1j1QlR7Ezj9L0=", "module": "sha256-2d9Hs8dDGIOrHx8dggwpgOvL11PtxMgrmb9ewsUzrS4=", "pom": "sha256-Q/Vic+es8z4PW10Qecf/pCRTHwHieUqdZHOt/RCkXS4=" }, - "org/junit/platform#junit-platform-commons/1.11.4": { - "module": "sha256-C54mJcj0aLPNQTLMCoBfif5B+FLRrf/3Xz6xRlyhy2s=", - "pom": "sha256-zRLSt8JC8WVUjtnJQGFg3O22CAkltHz3MeD9rl+0vOI=" + "org/junit/platform#junit-platform-commons/1.13.4": { + "module": "sha256-Gnot58eYmV+5eyRNbvnpnDpXmbV6D7rNaElrp+6BWdc=", + "pom": "sha256-RKWQ1nrsTSdskMUVj+EEePITPwoj7DLPqzqlXUK4aIM=" }, - "org/junit/platform#junit-platform-commons/1.12.2": { - "jar": "sha256-5oOgHoXfq+pSDAVqxgFaYWJ1bmAuxlPA2oXiM/CvvBg=", - "module": "sha256-ZMeQwnpztFz8b4TMtotI92SQNIZ+Fo1iJ1TUlmkrwic=", - "pom": "sha256-TyuKkGXJCcaJLYYi1VO2qwpwMhYkSZ47acEon1nswHc=" + "org/junit/platform#junit-platform-commons/1.14.2": { + "jar": "sha256-kRf5qtxmOsVQrl6B2NOrnx4Juy40wW5goesWM6F7zAY=", + "module": "sha256-LIpzAEQQ2y0nkUEBq+hnLcackhHD0ziuNHHZSisratI=", + "pom": "sha256-b6pnFLuLb4V7Gz7Tthz5EOv9rZPyWDJ506T9RWVa+cU=" }, "org/junit/platform#junit-platform-commons/1.8.2": { "jar": "sha256-0uAV/KcTDnmvL0YI3FRBXksQtZLXczPey0saJ0wYUFA=", "module": "sha256-NChH0wRv6kNVlWkttPBdXwOeDh0eIE9NV1WQJVcIJiY=", "pom": "sha256-zoUuNMahhKpsgO6N8EcXE6dAgTQTTwjjwcPdh8a1mrc=" }, - "org/junit/platform#junit-platform-engine/1.12.2": { - "jar": "sha256-zvDvy1vS4F4rgI04urXGVQicDDABUnN250y2BqeRHsg=", - "module": "sha256-+Xsxk2wRnAgtTQOM3resDmVvRR2eXX6Jg9IqJONvoQM=", - "pom": "sha256-lICxinlldp0Ag8LLcRBUI/UwKo8Ea7IEfm2/8J84NJA=" + "org/junit/platform#junit-platform-engine/1.14.2": { + "jar": "sha256-WkXEMHY6JsbFVHHhktivu2RDlWvBFrfmeWuNeJpaFG0=", + "module": "sha256-rJRHEJU5b12sFYUmoSVj/dUEkq57Km9JH62ixRsHS+s=", + "pom": "sha256-k2qlp7HfWDlzoyJ/y9uV6nTjHhvrGOqGmS7JBlPwqGo=" }, "org/junit/platform#junit-platform-engine/1.8.2": { "jar": "sha256-C30AD4w+jl99a4GWSZNue5k4MU6HyPmDgFIY6ldWflk=", "module": "sha256-66d7Nu/fdaZ/RkODM4JfnkSPVQ1SHnJJ2VA1hYDuY2s=", "pom": "sha256-AWhkMmYGDtko71qBgjAD7PrnmpqMC7/Xb0IBxsnXccU=" }, - "org/junit/platform#junit-platform-launcher/1.11.4": { - "module": "sha256-YMRTMgm6WHsc2n1ywIfzUaMjH5uRyU8/djlLDiI0HMQ=", - "pom": "sha256-tnzVOALgaqgqpZZumftCkX0iBFeEnlwIDINgdT7WfDE=" + "org/junit/platform#junit-platform-launcher/1.13.4": { + "module": "sha256-EV93RVdA4MPFOYvN2EHIqmmcLYACsRAPKuemQ9lAWSg=", + "pom": "sha256-OuOHauC4fbi96hJ5ryuXjaKfE4selfYFoD2aUtE529I=" }, - "org/junit/platform#junit-platform-launcher/1.12.2": { - "jar": "sha256-3M8sH6Cpd8U60JSthZv93dUk2XWUt2MHrXh95xmFdX8=", - "module": "sha256-UKBqBDdOMA57hhWIxdwNAhQh4Z8ToL2ymwYX/y/ehdE=", - "pom": "sha256-YZFFzSFdMiJTcr5iW7ooaD10FC/uGl39scZLUv6cC1E=" + "org/junit/platform#junit-platform-launcher/1.14.2": { + "jar": "sha256-HfxXdiDdEx6Ddl9mKsqhCaLfV1KgOZ8DTIaKyHMyOvI=", + "module": "sha256-TlbYQ96bbUO3CC/Ux0IHDSp9+rUZL7oaKQCYDwa+MTk=", + "pom": "sha256-BFn8NaM0Pr/qeOt5MvpB7OdtgyQ3A1MAsEjnpC6A5wk=" }, "org/junit/platform#junit-platform-launcher/1.8.2": { "jar": "sha256-giFWQJ/YPmguTFGZs0YAVCmbU4oFjCxtD1ybalvbdZQ=", @@ -1768,19 +1778,19 @@ "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, - "org/mockito#mockito-bom/5.21.0": { - "pom": "sha256-nnTHreXWZeYN+Z1/Ie1LOEVCATAbEszguvioK/kw058=" + "org/mockito#mockito-bom/5.23.0": { + "pom": "sha256-Cvlh4F29XWlMpZx8mfNyRlJ/5QDpkpPeZb4zMEOP0ZU=" }, - "org/mockito#mockito-core/5.18.0": { - "jar": "sha256-o9TkD3/mYBb+QsAN5ONDd310Eyr8hQGODwOsYzSmDyk=", - "pom": "sha256-cCZWNGCaFVU3MDM5Ht/rh5Apl0EgpxL+DZrYC6JI790=" + "org/mockito#mockito-core/5.23.0": { + "jar": "sha256-rilb69XRH6uXqyl4Fdx2FxiLhgA8vOPf1cDVw6bMSgw=", + "pom": "sha256-wC4pALknetv+EnVtfQuUcua55Zcq4fKNGaQaplE3d+M=" }, - "org/mockito#mockito-junit-jupiter/5.18.0": { - "jar": "sha256-CIEdIIXe74Puy7vGeIXXpvbO+ZunJmgoAXCqxqSs0mU=", - "pom": "sha256-6pbNic+y9Ik1qjjyZVwGL/LGKkimAFgXk+/7qaa+iUY=" + "org/mockito#mockito-junit-jupiter/5.23.0": { + "jar": "sha256-ZZOFJv3DEbs6HAAV6xyKC+gVFaqZjyK59OkvG2aOT2M=", + "pom": "sha256-tm0N+BqrLtL6U8mQ6pDC8fkVAxvIXkGGAt5M+40q1+g=" }, - "org/mongodb#mongodb-driver-bom/5.6.2": { - "pom": "sha256-J6xTaeZs5XbBW+DeW+TU37Cm/xW8NNuL1/atPtSyAHM=" + "org/mongodb#mongodb-driver-bom/5.6.5": { + "pom": "sha256-JL0tifFAIOonRYQymYaqO/26sen4oH0JEyKBmtsq8qE=" }, "org/objenesis#objenesis-parent/3.3": { "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" @@ -1799,142 +1809,151 @@ "org/openrewrite#rewrite-bom/8.43.0": { "pom": "sha256-aTTMvsnwC5QFTU6bRoUsacosiUeinr4iC1/tgpsw3e8=" }, - "org/openrewrite#rewrite-bom/8.71.0": { - "pom": "sha256-zReadfc1+xrwN/gdm49XhYM27+nGNCuyLzWY9MpfwGw=" - }, "org/openrewrite#rewrite-bom/8.79.0": { "pom": "sha256-TUuYOjiEJuq35xusJeIPGD69dLHqXfjV1dXQDZlTR7c=" }, - "org/openrewrite#rewrite-core/8.79.0": { - "jar": "sha256-XQ7amH73vbrtPyJ0SL2PyEFu3tbSJ4GEFuFfZeljKLM=", - "pom": "sha256-BZDdG9gXTY1gOhfuKybbqEUb4n5kbD/SebUHqQqfb3c=" + "org/openrewrite#rewrite-bom/8.81.6": { + "pom": "sha256-TvJDYuygE/mwH4NrDf6muPoPH6me3Uax5zvOYUZqvf8=" }, - "org/openrewrite#rewrite-docker/8.79.0": { - "jar": "sha256-QlZlAQa6IJssVdRHHKj18QwLwyGRz1tYys3shSp8HGw=", - "pom": "sha256-k9OwFgU/X4mviKp9OwP2yPNnX3oI94JOtK9buO7388I=" + "org/openrewrite#rewrite-core/8.81.6": { + "jar": "sha256-QEXRMhoktibFtFav6jnvf4LF319QVpHR9kypVVpf9Z4=", + "pom": "sha256-xe1TTDqh9ZVyHR2rUtslp7scJrS3KkfIQNFjm7SJfb4=" }, - "org/openrewrite#rewrite-gradle/8.79.0": { - "jar": "sha256-EiJ5MpVuaaReBZVJle6TxYlsxwtawWc0hiEnQuJMEqI=", - "pom": "sha256-AFTD2KxsymGT+eyp0RaT+y4VwoCklF7Fq4qZ+R+HrYY=" + "org/openrewrite#rewrite-docker/8.81.6": { + "jar": "sha256-nlbJXJ9l07bpVwaEvCQXojKy6aNMI0ocHv1RrzHboy0=", + "pom": "sha256-nxu3nlEj4lgcqufIJtwPMZ2PKWn99W/c4slgQBw4HsI=" }, - "org/openrewrite#rewrite-groovy/8.79.0": { - "jar": "sha256-kq/se1bb46cgFc9bG0X3IPvYAnAWHFaHHtxzsD8Gn00=", - "pom": "sha256-E5PZvHKBXSEWpqmbGlIjcT3wcTLsBwRwOVx7F2MGle4=" + "org/openrewrite#rewrite-gradle/8.81.6": { + "jar": "sha256-fUTvKL/axS1FPLgKEe1CdZQsIKlgzU1ZWRWrL/8Lz+0=", + "pom": "sha256-SIBua9EZnHI4Vr6f/SVHYL/15s8Q7onRO4VLNoSMbZI=" + }, + "org/openrewrite#rewrite-groovy/8.81.6": { + "jar": "sha256-uWPXUVbTT4SnFY17fJdIEw0z525mPIViPXeqav3E9BQ=", + "pom": "sha256-F7DwQ8daXkoH5JelJXRA8fxO07FVTHwVtbN5pYQTpDE=" }, "org/openrewrite#rewrite-hcl/8.43.0": { "jar": "sha256-6XtijdTRnCMBseND0BS4Hi62zBNHq5eg70696Y+gZlI=", "pom": "sha256-aOZIF6ywP9bSUdQKyNqQZUS+moBjWCAjp5h1Pgfk25Y=" }, - "org/openrewrite#rewrite-java-11/8.79.0": { - "jar": "sha256-qt/i6z92UVKFMXtLcx1NQBooFs+V8naTpWMOuXY22Z0=", - "pom": "sha256-sgS+LUsKaEeWowDvT3TcYCzTByCQoIk/WepprUYZ08w=" + "org/openrewrite#rewrite-java-11/8.81.6": { + "jar": "sha256-PKHjfNuhe+lBRAluzwgRqDZinYG2XTXHu5KTPb1P7+E=", + "pom": "sha256-rT2oaAGGj5lR9zlQwIMD2vappuwR1g5XynuXo5+REuQ=" }, - "org/openrewrite#rewrite-java-17/8.79.0": { - "jar": "sha256-2H5X5zlIq38s1ypN8yT4AL0EMphW33XdWeypkFRD0CQ=", - "pom": "sha256-xgO+DtMGGoTsUTHoGkj/XGVH7EVBU2USN+bEIPSF/Ig=" + "org/openrewrite#rewrite-java-17/8.81.6": { + "jar": "sha256-peIWpBwE01aopCgTDyQWlcbhXgq1HlRaBvw5lg2t+cI=", + "pom": "sha256-acbDVjzV23rOB3dPHZKjHO0St5DeW9FlqJ3GQQNYMhQ=" }, - "org/openrewrite#rewrite-java-21/8.79.0": { - "jar": "sha256-iGFOZ2iEF7PTedfehbLsenksLR6LIZB6XQG0fshnPvQ=", - "pom": "sha256-ShryCd7CV3IDXKNm9yzQ7P1XHMYrOeQ6IFNoicGFPSA=" + "org/openrewrite#rewrite-java-21/8.81.6": { + "jar": "sha256-MBnNScsv22azKT0+Fuoms66vs84mq8rTLl/SvSG/aOY=", + "pom": "sha256-7lvxYmP2sPZX76NInuIxUjPz53EpLIipDLvb7oBXAoE=" }, - "org/openrewrite#rewrite-java-25/8.79.0": { - "jar": "sha256-tpS3xoR1OOi3U4lKFJ2xFLb3h5G01h+HD9PJGaNW/ao=", - "pom": "sha256-94b6MYf4JtYzt3GwJ7NcRHFvZI4KRnysg3Sap/gXeeQ=" + "org/openrewrite#rewrite-java-25/8.81.6": { + "jar": "sha256-pwepwj5L/LGb0iHFYzcaVC+CAQWqJLZZxy4/LElEXKc=", + "pom": "sha256-lzXUzjxMNpz/zNG4wdOOHBWPB6T3ZzybH/VDztaequc=" }, - "org/openrewrite#rewrite-java-8/8.79.0": { - "jar": "sha256-MzUvlTeLhrcloY1NXxr19sJYOdPZUJGfElNnV70jTHA=", - "pom": "sha256-LBoLvaZm19xZLHydRJjJJ+CrR/UptL2sGjmgIj+rLmA=" + "org/openrewrite#rewrite-java-8/8.81.6": { + "jar": "sha256-lq++Cn4vAbMxZPEMfGCmVoPxZkEkyaqq51Eljovt6dE=", + "pom": "sha256-aG+3+ZmZ3eCvI1QQvj+m1D8fzijxt/bzNJN88Kg/2yU=" }, - "org/openrewrite#rewrite-java-lombok/8.79.0": { - "jar": "sha256-H7Q5B0pc6EKS6gdNml7R4t0JYIqr/8Y8LZi7676qYYI=", - "pom": "sha256-96yl1Z9rWyxibVnOl8puslPcQteq174Z29GnUAonTXY=" + "org/openrewrite#rewrite-java-lombok/8.81.6": { + "jar": "sha256-r/cn7ffHcsFXFKeEEWrVLO+L3+o8YKes+q+zod1ml5k=", + "pom": "sha256-iEOa/jCr8b0j/tLjS0Bs7IILHDokAu7h6WX7AhYTuKs=" }, - "org/openrewrite#rewrite-java/8.79.0": { - "jar": "sha256-miKg4c8mP6qGeTZQ1DtVdP2oe9mI1tI9373bNGFtmBg=", - "pom": "sha256-RO90rlUEHNNbhS2NL2LGmNcRB8arFp7ZirqQzO4mLss=" + "org/openrewrite#rewrite-java/8.81.6": { + "jar": "sha256-CyEKcOmewSYQxG2J+Zh8MVLs2+bljsfBiG1gfYcOuq4=", + "pom": "sha256-+wJHa/zCsk3oXtba4+36FxSXNjeBfJ5lhs+xewaIA/k=" }, - "org/openrewrite#rewrite-json/8.79.0": { - "jar": "sha256-VycvofMX/BEcQDAyOoN6Aa4gcAPtVklO72Fd9A1Vuvs=", - "pom": "sha256-ctB6BAtNXSXeQbEthgOjKu3Edo2Y4JC8v6p0rmssQ0M=" + "org/openrewrite#rewrite-json/8.81.6": { + "jar": "sha256-X8Wk5H4jZW0eG9n6p/oF25V5Ny50C9axtXLoyRGEAOw=", + "pom": "sha256-LD7Upq0Bxwpm/L1rOy9z9+r6KTzaPLWDZV8i2S1J69Q=" }, - "org/openrewrite#rewrite-kotlin/8.79.0": { - "jar": "sha256-bHV70xvSgy488TO2hl/d9TCfj8ztkg2BSmsb+iWL804=", - "pom": "sha256-lfUhxJJQgEuz3lAgs4/unosEt05/c6mb2IFQrSIMMhw=" + "org/openrewrite#rewrite-kotlin/8.81.6": { + "jar": "sha256-FTWeKjHsA2X9xtIQJrp+CyziqXg7PU6DRPl0fkE25cc=", + "pom": "sha256-sh+ou/7jHh7Y18MOxfNvvhPOawub6wNffbn5znFaU6k=" }, - "org/openrewrite#rewrite-maven/8.79.0": { - "jar": "sha256-2dRHOW3xZNeQq4qLX9g8ux6qlVZFTeZ8eU62KqVFyMU=", - "pom": "sha256-CbuZu1goYhAiN3HbvBjHw/dRWPDGlGdix/JRKNylG3Y=" + "org/openrewrite#rewrite-maven/8.81.6": { + "jar": "sha256-KvnYbc18hpy7Kb/CakB17u8+IuA32saGI/0mUi0CNcs=", + "pom": "sha256-ovtowv1L4qT4BRkBXEIicx30xitDYl6PbxsoL9czKlo=" }, - "org/openrewrite#rewrite-properties/8.79.0": { - "jar": "sha256-GbhYO2uJRlnjPUjiYoUHyiTNDwq04vKacfIX0xbvT3E=", - "pom": "sha256-7Jgx8wH29LIa+k4bD3Fmof6yxpXSEzW+rgyjjyqSfkI=" + "org/openrewrite#rewrite-properties/8.81.6": { + "jar": "sha256-I1JrER+2xBJ3vhixCFritWQKfujwPp1f41m4/hs+UMU=", + "pom": "sha256-weNDft1XuuLC2gCs1Yyl/DVcHYWOux+8FfcB36121c4=" }, - "org/openrewrite#rewrite-templating/1.41.4": { - "jar": "sha256-m75BsXCKsfUBv7YD1bY9Xa9YbW7Z8+rO5NL/46Xpnno=", - "module": "sha256-h94biaiiEFd25u+C/3JTRaQGuUQt9zGEROCkXdi6HaE=", - "pom": "sha256-heBhCgDqzoQGrB+L+Rzzy2XLfCZUq0S9SQE01M4mSWs=" + "org/openrewrite#rewrite-templating/1.41.6": { + "jar": "sha256-tYRt09zoo1kVmbttz/88mScRQS5d/yqhEaSA6yULfQ4=", + "module": "sha256-uwn9/eUklyFdRsV727y7JiqZT/pi9B2nyBl51NTnU6A=", + "pom": "sha256-NP7dtTwDvcxN36Nsf0qW6hq3KB3RHxNE4qKXC1uXvd0=" }, - "org/openrewrite#rewrite-toml/8.79.0": { - "jar": "sha256-tknViiiQhAEDgRZgzVfLBpT4TD9TkwFBmu9MaLuSpL0=", - "pom": "sha256-/dvcCNP87ORiFIQA3Q2iVNbbGQgpKi6IWkqPlxcxq5Y=" + "org/openrewrite#rewrite-toml/8.81.6": { + "jar": "sha256-YC1sr2cYJf8aj9fR1WOXryxmKw+9H5azykGtyOv0sew=", + "pom": "sha256-fxjewocEUV/RmlwSvxfvygCKBgXIren1j1ugf8N0p08=" }, - "org/openrewrite#rewrite-xml/8.79.0": { - "jar": "sha256-P9WFSfI1X8XCLJKdCOE+/zxVWsxnYqPtkn8gw3nLPcc=", - "pom": "sha256-8gKO+Cuj8hAVG5ZwnnB0smprPJajn1MinMDpfAPk3dM=" + "org/openrewrite#rewrite-xml/8.81.6": { + "jar": "sha256-2WCaEYF8Vc2qFZfWCMLPuv9+kbao++Nbt2vLmMq4TTs=", + "pom": "sha256-9yWwRArkvayAQlkSSk71yqt7ZDISomxLIjzou8Gtqbg=" }, "org/openrewrite#rewrite-yaml/8.43.0": { "pom": "sha256-72t+CkLZ1z/JSDj5GV7NAloMFwawqbmybz22VT3NDPc=" }, - "org/openrewrite#rewrite-yaml/8.79.0": { - "jar": "sha256-ivLomlz7/wD4Xq5Cfy/l9vgr38yENdSMUtI+YMAtHWI=", - "pom": "sha256-VB2NXai3+zXxdEDs5gvB6skczAK8FCCNsifKzw6JDbk=" + "org/openrewrite#rewrite-yaml/8.81.6": { + "jar": "sha256-0Up9p/LWh8PcHIFzGR3fVUuBBbsy0d7vcaFPlQ+txoQ=", + "pom": "sha256-7YMo6Xo71laVKpep7DjopCziULS+5+qCzaOd/DEwSIg=" }, - "org/openrewrite/meta#rewrite-analysis/2.31.8": { - "jar": "sha256-wSPlI7tQuMJ68v9NtY4/OcZOXv9BzQiTy4D8v1P0oU0=", - "pom": "sha256-Ghl+HdCfoCqe92yQDIphYUdcIo0GN7WrKM1svXU7/os=" + "org/openrewrite/meta#rewrite-analysis/2.32.3": { + "jar": "sha256-xZ9HK68zNExkchMLKkPpTCbFb9tilvIs2zwiMcFSp+k=", + "pom": "sha256-32coWrIdmTGoXPzCwVpqKrpiSlhPwBwfKvnDaC/5IBw=" }, - "org/openrewrite/recipe#rewrite-github-actions/3.20.0": { - "jar": "sha256-u80ocnWnx3Z89w8c/lMLm3adpVgQJzmDqu46CVGL0t0=", - "pom": "sha256-+zri0b99o75Hf99+vMJqhaxK4E9JHlQMNLmfQtmR3L4=" + "org/openrewrite/recipe#rewrite-github-actions/3.22.0": { + "jar": "sha256-Gb56RUrqY/rHKv/QNZnTy7OjW4+TaR3B0gYglB2Vitc=", + "pom": "sha256-B+JPpwkd80YqCR17W+hExGspOwhjstsF4mkffCa6+1U=" }, - "org/openrewrite/recipe#rewrite-java-dependencies/1.54.0": { - "jar": "sha256-oHzrBSX4/Pf74YoDDI6tdPgceIDSg4FbN+nZ4hgAnPo=", - "pom": "sha256-Yu3y7RDEKOU9Dtw4mr2URg4M8pfm0NYUvT1m08UOXkA=" + "org/openrewrite/recipe#rewrite-gradle/0.1.0": { + "jar": "sha256-zVNmLi3Jm23kY7gVIgIL5v/+RcfYg/CcBbGRGK2smQo=", + "module": "sha256-wmim/2z964nkbU5EMJJusk9KDWP9W1SuwToHwFS2zUI=", + "pom": "sha256-wcBz4Mvu80uZ3fMWix5Xq5z9BBVt/xlAGwyB0I1ercA=" }, - "org/openrewrite/recipe#rewrite-jenkins/0.34.6": { - "jar": "sha256-GuPCWkEQunZygSnAwcoebGQo6+IzM/iEkMPD2tVCpng=", - "pom": "sha256-5KOpjbOWtahO65mgolg9Pj2EAYG+g0ztwMxUCRUkuOk=" + "org/openrewrite/recipe#rewrite-java-dependencies/1.54.5": { + "jar": "sha256-nlJJYiq7SlaumZkAhWcGNeA+rsjngUF56LKHf7n5kdY=", + "pom": "sha256-7XkXmEZYOoWs77GGCRKC3kwfd+anW2PTl+6nuvAtMIU=" }, - "org/openrewrite/recipe#rewrite-migrate-java/3.32.0": { - "jar": "sha256-jEDG548RGl3bcLNlHBh0vt5F8Iv6Hk6GPiEJMF3YyNo=", - "pom": "sha256-yTwdBLJsBCNUIrdP15FhLtaRVUXtWMzifsw954h4d/M=" + "org/openrewrite/recipe#rewrite-jenkins/0.34.10": { + "jar": "sha256-VE9JX9rnfaid6h3IWhE7ESCrmMY2MRQLi4SaTCyzRH4=", + "pom": "sha256-lWUATS1OozA6bmF8up7THv1M1LPkVePRefsR8aioSFY=" }, - "org/openrewrite/recipe#rewrite-recipe-bom/3.22.0": { - "pom": "sha256-c2Wj/1gbUVkcheCocQgec1iZD7mMK8yJwbsUgteDbEU=" + "org/openrewrite/recipe#rewrite-joda/0.8.3": { + "jar": "sha256-rNprMglEuukiGCbcCWVBMapWUQUwFCxjxQpIldd6TU0=", + "pom": "sha256-/L1gcnflCabD5H7oqEi8BKVgZ36kXtN/SnDJpXXkXXM=" + }, + "org/openrewrite/recipe#rewrite-migrate-java/3.34.1": { + "jar": "sha256-+Cv/+4W2sqETw8/s7FNIKXIB1eFNpnEse/5mw0XpnHI=", + "pom": "sha256-qm3lPq3fMouOLFWbwoNan4aK6mJ82EO6Jk+kUaSejxs=" + }, + "org/openrewrite/recipe#rewrite-recipe-bom/3.28.0": { + "pom": "sha256-+NgK/p6NgPNDa0ttXDDjWNQEKAuBlnAhNabBkIDSROE=" }, "org/openrewrite/recipe#rewrite-recommendations/1.15.0": { "jar": "sha256-l9lBb4GjtZnn+FEcNUYWwP+gh5lTsKikhMAedlpIToM=", "pom": "sha256-2U/5/BgEFyv+9YWmTVXFVYvSXlIBGLD1WMWDeHzQNiQ=" }, - "org/openrewrite/recipe#rewrite-static-analysis/2.32.0": { - "jar": "sha256-GKwgklnT1nl3XtH33+7mWvNIgZDEuarp1AoRv/XNY28=", - "pom": "sha256-AMm/Yjno+JQO4cteU2+tbS7jit95WPHYy6EWNWVppfs=" + "org/openrewrite/recipe#rewrite-static-analysis/2.34.1": { + "jar": "sha256-+PPXRPM4KMyXR/vlH0r8oXF0muoGmLSfid2SvA4Aavg=", + "pom": "sha256-mKA7p3qElaQ2FRREDWNNqDUgM1wanqKU5r02z9cQNQc=" }, "org/openrewrite/recipe#rewrite-terraform/3.0.0": { "jar": "sha256-eRE9ddUSVt1mNDwzNfQAf6x7tfUuEcAbBme+dChn9fQ=", "pom": "sha256-wty/DCXqoHDIMFh1EN5se/KMb8Ht22eHE6Sd9JGqwpk=" }, - "org/openrewrite/recipe#rewrite-testing-frameworks/3.34.0": { - "jar": "sha256-wKVIq2/oUt4dbbSbcsimnUD4wWMsSkmyipyLHQqVO08=", - "pom": "sha256-rSQnvC7t3gsoavLX+1CmleI1xZccqjR+OC52X1tsnOc=" + "org/openrewrite/recipe#rewrite-testing-frameworks/3.35.3": { + "jar": "sha256-2t2Tk3EjGO0dO/yKMdjV7hb7tPWNAsLv6QHwaF07iyc=", + "pom": "sha256-8w5Yijr2AiwcWTpJpPG97jZJ7Bj8MS6xosfxcdSpkwc=" }, "org/openrewrite/tools#java-object-diff/1.0.1": { "jar": "sha256-jc8DgdMGxSI86kwKy4Sv1WkexutB4Lajbdooigx+xNw=", "pom": "sha256-WB1ijMi/jOggPdk0mFEiFkhqZeiG6KM7lLgZgdWrEe4=" }, - "org/openrewrite/tools#jgit/1.4.1": { - "jar": "sha256-SjFr8Z4OsSW65JExcY4XtHaVxb+cgINZaUCB57oBy74=", - "pom": "sha256-jWzoE7iIlYtixhzxV94P9d0OolhGzJtzHrXo84cXVcs=" + "org/openrewrite/tools#jgit/1.4.2": { + "jar": "sha256-R0PhzrIaeXvBeG6Ws9hkVOm60tQ0cw1wUOlq7zRIVv4=", + "pom": "sha256-tyc2oU6oNIhh9GeB/6R4gcZnm5YGn5tNf6/TcwD3Ytc=" }, "org/opentest4j#opentest4j/1.2.0": { "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", @@ -1983,9 +2002,9 @@ "jar": "sha256-bzgoohXJIAWaXvovtVwjPWxU7FytypnOGxvdEAd8fd0=", "pom": "sha256-rKaN7pui9s2Q/95yjv3H4+v89Z8/Qfv+JI0tAdW4Zq8=" }, - "org/projectlombok#lombok/1.18.44": { - "jar": "sha256-xukb/cNYux77Je4YXpWq+bYABD5fgdA712rvwBA1v4Y=", - "pom": "sha256-OVHse72PKj1jcndGuCxzpU0+xEqe4l/8L2PGmW6eUGo=" + "org/projectlombok#lombok/1.18.46": { + "jar": "sha256-AfexoBXjPiti1fXzcFMwY1erFBX9GB/Lp3lPXRmMESY=", + "pom": "sha256-KU6YfPJrN+2d4bl9MgOQkNJ8WH0OBM6irkd2b6cDiZU=" }, "org/slf4j#slf4j-api/2.0.17": { "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", @@ -2014,16 +2033,16 @@ "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" }, - "org/springframework#spring-framework-bom/7.0.2": { - "module": "sha256-+3+nBI3qzmuFDm8sqWoIn2C8tKtNKhsZOaG/PrgOHKw=", - "pom": "sha256-00mTsqATTgb6NDmD6zdMojzd+LNNcaRsr0sjXuCHwGc=" + "org/springframework#spring-framework-bom/7.0.6": { + "module": "sha256-BWbzrij/gW5oNkc2w5s4RxXqE3tyIXwRJOzv4qPDdiQ=", + "pom": "sha256-AVb6cRO+cu6/NI3E8orgclxeKnDz1E4juMDrdn8Cp2k=" }, - "org/springframework/security#spring-security-bom/7.0.2": { - "module": "sha256-+3kx5Muv0dR3FtBkvMkDAAigz2iCQDBJ5YB1D+ULC/I=", - "pom": "sha256-sxqFOFfStOReOcCIl7vgvHz3PyuaZfqBY+e9UACQFZ0=" + "org/springframework/security#spring-security-bom/7.0.4": { + "module": "sha256-IGHRbZIcWfeguZwYX8SS4sPr2xJdmxUKmOZ3Cj2j8Fk=", + "pom": "sha256-BlSaYT3cB0LHi3NyVnFlU+3Ae1QVDJdFFAn/ksxSF70=" }, - "org/testcontainers#testcontainers-bom/2.0.4": { - "pom": "sha256-Ua73WDIROPjgGuJ2k4FJLj66Aew2jgM+yAgcHYchStI=" + "org/testcontainers#testcontainers-bom/2.0.5": { + "pom": "sha256-u7oTdgIfv04UZjph8QzRr/FKXXT7VfGhS+b9beg9fu8=" }, "org/threeten#threeten-extra/1.8.0": { "jar": "sha256-UeTSHtxOlEf3dgwFDguu5119lz84e6YFoXq9xNJP1tg=", @@ -2033,36 +2052,29 @@ "jar": "sha256-hXkX0jGaTpLcHF4663Wg2shERe0xXnrD2Cu40rKYl38=", "pom": "sha256-nLthSu/sbVcp7MrdZMmhnpshg/w6Dgk8APN2rPptC0Q=" }, - "org/yaml#snakeyaml/2.3": { - "pom": "sha256-D1omWgYzGwBJ41K+MsoyLeGLF/PU27cGNdQNppLjWC8=" - }, - "org/yaml#snakeyaml/2.5": { - "jar": "sha256-5mgqzxrOd1CO8TZJy/T40J0s9UV722HSX/tqwCM9eN0=", - "pom": "sha256-ugGuenRMtS/o7POwI8vDLgzMjGvu+fJt53pHgII5RH0=" - }, "org/yaml#snakeyaml/2.6": { "jar": "sha256-yPepjnOUrdoC9jFySXEOTRtMeiWqjH6s4MLupS64v4U=", "pom": "sha256-J3Ow6UiWTSHjew4dzzkCXmJ7hz4M5qoqR+I8N0MD4MQ=" }, - "tech/picnic/error-prone-support#error-prone-contrib/0.28.0": { - "pom": "sha256-KqGnWN3IZbsOFz4s50t/BDv8hyiCDBMoHD2FpTgwF6U=" + "tech/picnic/error-prone-support#error-prone-contrib/0.29.0": { + "pom": "sha256-isaD2tWURXBrMYszMTEX3lS1IN5TwT2v4/DJotuMgio=" }, - "tech/picnic/error-prone-support#error-prone-contrib/0.28.0/recipes": { - "jar": "sha256-6P1VvLhRHagTyuISmEdrPs+PPKRhG37DojZCppVuKu8=" + "tech/picnic/error-prone-support#error-prone-contrib/0.29.0/recipes": { + "jar": "sha256-ljDnrSAOlNZTWRS0ZrBWBHQauZlMTO64XjugX9lksKk=" }, - "tech/picnic/error-prone-support#error-prone-support/0.28.0": { - "pom": "sha256-Iiyhosx5SX4TZ6kPsh/Oz4QnjfOKXKKOvn/S1vB2+I8=" + "tech/picnic/error-prone-support#error-prone-support/0.29.0": { + "pom": "sha256-oBFPB3Qje3UEY+dTHcHFTJ1NulHkQ5z/pTGgiyBATys=" }, - "tech/picnic/error-prone-support#error-prone-utils/0.28.0": { - "jar": "sha256-EixPpNut12e+umvnfDwBWQxMBlNSra27DEbzR0GUk+w=", - "pom": "sha256-lO/UMlDikBl0g/TLd81hR+4VlLPnT9Z0qN23q6KYqVI=" + "tech/picnic/error-prone-support#error-prone-utils/0.29.0": { + "jar": "sha256-+VSvxMxMsl7qQtElgrc766sgbAYz8Hel0Sbxi8ESsR4=", + "pom": "sha256-s1eIbBMiysPrVc9SCkaklRIZNl9I+w9+tX1kUWPDaSw=" }, - "tech/picnic/error-prone-support#refaster-support/0.28.0": { - "jar": "sha256-3+AmLeZKXmwbAIvLA/fX3nBuIVikULwRXoROdIlRgdY=", - "pom": "sha256-LYzXWj49aOXnijLEib0ePEpDGFeCghKgHOcPRV8F8m8=" + "tech/picnic/error-prone-support#refaster-support/0.29.0": { + "jar": "sha256-pWCuetZrFqp8ZEZlwBhR9PavQux17xBituE+CmhErSw=", + "pom": "sha256-/P8JHThW9LIekGELZjb1txmMeslGEt97m0np1twQxvw=" }, - "tools/jackson#jackson-bom/3.0.3": { - "pom": "sha256-hOPOTqXFbXvqiGH+HEOayaGd1UqaPem4oIhL8LvHUPI=" + "tools/jackson#jackson-bom/3.1.2": { + "pom": "sha256-vg5eRYB/TeVRTR55M/rPc4gSGz3ZvzGjqz+HogBlCqI=" } } } diff --git a/pkgs/by-name/fr/freerouting/package.nix b/pkgs/by-name/fr/freerouting/package.nix index 8d6db2acc111..54ec58a700dd 100644 --- a/pkgs/by-name/fr/freerouting/package.nix +++ b/pkgs/by-name/fr/freerouting/package.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freerouting"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "freerouting"; repo = "freerouting"; tag = "v${finalAttrs.version}"; - hash = "sha256-WhEofQs3TwnhB9fSROPQfWd1PHCDoH790lV54ujlmX4="; + hash = "sha256-e9aqMYvWp/xfY+g5viH4vyOfl/JhNxMIIUKTy/8aIXs="; }; gradleBuildTask = "dist"; @@ -60,9 +60,6 @@ stdenv.mkDerivation (finalAttrs: { gradleFlags = [ "--no-configuration-cache" ]; postPatch = '' - # The rewrite-gradle plugin breaks the nixDownloadDeps task injected by fetchDeps - substituteInPlace build.gradle \ - --replace-fail "rewrite 'org.openrewrite.recipe:rewrite-gradle:2.3.0'" "" # Disable telemetry and contact options by default substituteInPlace src/main/java/app/freerouting/settings/UserProfileSettings.java \ --replace-fail 'public Boolean isTelemetryAllowed = true;' 'public Boolean isTelemetryAllowed = false;' From 44aea721b5a3b40acd8a6e47ca273b41237dc1eb Mon Sep 17 00:00:00 2001 From: James Hollowell Date: Sun, 10 May 2026 22:38:29 -0400 Subject: [PATCH 0235/1079] ersatztv: 26.3.0 -> 26.5.1, update repo to "legacy" --- pkgs/by-name/er/ersatztv/nuget-deps.json | 382 +++++++++++------------ pkgs/by-name/er/ersatztv/package.nix | 6 +- pkgs/by-name/er/ersatztv/update.sh | 2 +- 3 files changed, 190 insertions(+), 200 deletions(-) diff --git a/pkgs/by-name/er/ersatztv/nuget-deps.json b/pkgs/by-name/er/ersatztv/nuget-deps.json index 7cdcbf90ba7f..6a383e15d49b 100644 --- a/pkgs/by-name/er/ersatztv/nuget-deps.json +++ b/pkgs/by-name/er/ersatztv/nuget-deps.json @@ -1,13 +1,13 @@ [ { "pname": "Acornima", - "version": "1.2.0", - "hash": "sha256-eDApwoJgsWOmCTGPn+o2xpfZEXupAw1+41nCBtAzTas=" + "version": "1.4.0", + "hash": "sha256-7SCe3Bgcyzlv6nXQfTOy3UZLc7ilZ3YXxgl6mcTF82s=" }, { "pname": "AdvancedStringBuilder", - "version": "0.1.1", - "hash": "sha256-pLixGUct2lQnSeckSHVnIEoGfsvz3gkA914QSHdaheE=" + "version": "0.2.0", + "hash": "sha256-66bPgNGU/wLpGs9mydkBBlTEJRpvfHDwWEysUsufZJY=" }, { "pname": "AngleSharp", @@ -46,8 +46,8 @@ }, { "pname": "BlazorSortable", - "version": "5.2.1", - "hash": "sha256-T+0zzQOq81NJUtER+9Ag5DQvn1v3+rbA5AOu/zqWFVg=" + "version": "6.0.1", + "hash": "sha256-VrK9dW5ULwfTOwxKvZU+OiXLuFEldmOx2kju5OBxSu0=" }, { "pname": "Blurhash.Core", @@ -59,16 +59,6 @@ "version": "2.0.0", "hash": "sha256-I22mdiA6Ltr0D2pyryUyS0z5YboBr5UY9LZFcer3FPs=" }, - { - "pname": "Bugsnag", - "version": "4.1.0", - "hash": "sha256-o30fm7J9tZouVRf0oZNR2hTukc2V8HpdRK30Uu5dZcc=" - }, - { - "pname": "Bugsnag.AspNet.Core", - "version": "4.1.0", - "hash": "sha256-L/aMCcmE7xLEtap5/H56VwCsDI4N/m8jgoj6SkxM7x8=" - }, { "pname": "Chronic.Core", "version": "0.4.0", @@ -76,18 +66,18 @@ }, { "pname": "CliWrap", - "version": "3.10.0", - "hash": "sha256-XMGTr0gkZxSOC72hrCjpIChpN0c0A19X3TqOAdBtgb4=" + "version": "3.10.1", + "hash": "sha256-uH4SXiMkUIPw5RRyKtDTTCSkkr3BhBAPrxnC4O4ES4c=" }, { "pname": "Dapper", - "version": "2.1.66", - "hash": "sha256-e5n/wnAFGPDSe30oQQ0fanXrvFZYYa+qCDSTHtfQmPw=" + "version": "2.1.72", + "hash": "sha256-9CKyz72/Vp5/GIoxJzl7RAXTj4MvKTgFi/7fGyhRqf4=" }, { "pname": "Destructurama.Attributed", - "version": "5.2.0", - "hash": "sha256-0WBuqkLizviaHA5xrbSbs8Z90MLy+fal+NPe4LyLP2k=" + "version": "5.3.0", + "hash": "sha256-1hj6Y0MSgjNRCSP90fFoaC3md58pOO9VsZzTpXRWFy0=" }, { "pname": "EFCore.BulkExtensions", @@ -126,13 +116,18 @@ }, { "pname": "Elastic.Clients.Elasticsearch", - "version": "9.3.0", - "hash": "sha256-h2ExrklcO6tVFV2ecxnGXA4uY9D1tiQ3sqmmN7wrRoM=" + "version": "9.3.6", + "hash": "sha256-vRFjnDERVzH3uk9i2j0M8ygs9qzq9fL8jWxhnUX0ins=" + }, + { + "pname": "Elastic.Esql", + "version": "0.11.0", + "hash": "sha256-o4OYz2vJq5jOjuOzs6YVIwO5nIQYV5pDyVYwFzU2oDM=" }, { "pname": "Elastic.Transport", - "version": "0.10.3", - "hash": "sha256-9AcJAN3uP3wywsm52caPg6Qgt4iZS0nhjIl2bb0hlx8=" + "version": "0.17.0", + "hash": "sha256-XRz9obr31ShKHAmNM9vkh9UZ7+u8GfGFvtX/wOduINw=" }, { "pname": "ExtendedNumerics.BigDecimal", @@ -191,8 +186,8 @@ }, { "pname": "Heron.MudCalendar", - "version": "3.4.0", - "hash": "sha256-QVrlIlO35o2LElr+Ac3F6UZHlI9fosIjheucWBF+QZU=" + "version": "4.0.0", + "hash": "sha256-B0XLRt7/V3pHxOwNNwDpua/R53wS8hN6TrA+iHw03Nk=" }, { "pname": "HtmlSanitizer", @@ -206,8 +201,8 @@ }, { "pname": "Humanizer.Core", - "version": "3.0.1", - "hash": "sha256-Wxqf1FRXtsQulLFtbfsfYu4oZmrCuOZAikMcY2i6Dww=" + "version": "3.0.10", + "hash": "sha256-mflSENjDof1Av9M9RLGEQcl4V4keVfH3qIxy/uxJ6FE=" }, { "pname": "J2N", @@ -216,23 +211,23 @@ }, { "pname": "Jint", - "version": "4.5.0", - "hash": "sha256-1+cTMz+HMVl+AVYRdpd77wblEF+aVRL+tTMoI46H52c=" + "version": "4.8.0", + "hash": "sha256-+K8NGiJ1SChiyMrjn4dJOiBdnWXP6UOfXSsNsJ5//tI=" }, { "pname": "Json.More.Net", - "version": "3.0.0", - "hash": "sha256-zlJb9Wi9ErFqN8FYphzog9paPxI3DBVnoTL0c12Bfks=" + "version": "3.0.1", + "hash": "sha256-U4Ers0TkbNsrC8TBJsuQcm9IHirf2BRCOf+9uaOhQSs=" }, { "pname": "JsonPointer.Net", - "version": "7.0.0", - "hash": "sha256-/1GemlLhmYnz/HDQTpEEaGxaofoFkFUMNNPInKhAvM4=" + "version": "7.0.1", + "hash": "sha256-KCU4NBKrNAJysKlew0IHN5TD+Euo83wfG9Pi1koAWEk=" }, { "pname": "JsonSchema.Net", - "version": "9.0.0", - "hash": "sha256-N5bp2OswdoQI5fe/ZaKmk7LwL9woJ5cV4D43IUeFJ3E=" + "version": "9.2.0", + "hash": "sha256-vz2JWvZ7HM87NXgGc+MS2Nff2q4u+w1gns8GK41LOmw=" }, { "pname": "LanguageExt.Core", @@ -279,11 +274,6 @@ "version": "4.8.0-beta00017", "hash": "sha256-hHL4liVC3k8+PZVIE8N8SdT8UQkEj55IocsY5QEX52s=" }, - { - "pname": "Markdig", - "version": "0.44.0", - "hash": "sha256-EVuUTv5l68t7bP2vJ2njypxuRzH52AztXyBF9LUJrrI=" - }, { "pname": "MedallionTopologicalSort", "version": "1.0.0", @@ -316,33 +306,33 @@ }, { "pname": "Microsoft.AspNetCore.Authentication.JwtBearer", - "version": "10.0.2", - "hash": "sha256-3M89gVZd6YdEKk+/VnNJoWgAkqPkFj8PC32ai3vwm+E=" + "version": "10.0.7", + "hash": "sha256-Y1DM6+4ji/xoAxv9NLsJOj7YUkQA5ItrlTR3NL2XcrE=" }, { "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect", - "version": "10.0.2", - "hash": "sha256-Lkp2a7n4MSsk33irb5ByVQ/zFZS5WcoG6Q+rwV8B27Y=" + "version": "10.0.7", + "hash": "sha256-hr1QgB9miQO2rXj5heibTX/fa3Tj/Nci8G/pDcrq11c=" }, { "pname": "Microsoft.AspNetCore.JsonPatch", - "version": "10.0.2", - "hash": "sha256-b1IIM+6HOht8cQsi82KM2epHJ/CvRn16UK57tyWRiU0=" + "version": "10.0.7", + "hash": "sha256-sbF5N0U+OXZKRUXXPppPrvJXevmUGnvDl6LqPtpEsBY=" }, { "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson", - "version": "10.0.2", - "hash": "sha256-KSRRa8gmn84qphEFNaLl0PwVmG/gQpgzMHc4FIct8E0=" + "version": "10.0.7", + "hash": "sha256-nVAGFNglXbdJtuk099NVyC+qN/lgL3T0UdZ0GtJ1d1M=" }, { "pname": "Microsoft.AspNetCore.OpenApi", - "version": "10.0.2", - "hash": "sha256-FU57fPXL4NUDRqi+rLresi4yKttv1KcAnLuEdPCyTos=" + "version": "10.0.7", + "hash": "sha256-WlAW49otxYzgrmuqHewUoBsjDcAZwhNz5WVbCT4EiIA=" }, { "pname": "Microsoft.AspNetCore.SpaServices.Extensions", - "version": "10.0.2", - "hash": "sha256-ZY0Aj8amA9XLD/SWu7+kc/2ROq8lwHa5cK7k0ec4j9k=" + "version": "10.0.7", + "hash": "sha256-xDbi4sbKmyrNYw+L1EIQx3RrVrezxPWICuz250dsEjA=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -421,8 +411,8 @@ }, { "pname": "Microsoft.Data.Sqlite.Core", - "version": "9.0.12", - "hash": "sha256-rV9MvBeKDh3DBf9IqHTzCogLKHsAJ0TEfcfSboCI/o0=" + "version": "9.0.15", + "hash": "sha256-4KjfN468fFj8sapfSv4FzYpuhTie89UJ5jg18Nm06zc=" }, { "pname": "Microsoft.Data.Sqlite.Core", @@ -436,23 +426,23 @@ }, { "pname": "Microsoft.EntityFrameworkCore", - "version": "9.0.12", - "hash": "sha256-TCGyEqqYfJ5nXiAi0xVZe8Bwx8TZ0xefLE7h87b40+Y=" + "version": "9.0.15", + "hash": "sha256-Ou8paIss4D6SL2T4mUB3URVD9gkpK6YQ+mmvTuwmxzg=" }, { "pname": "Microsoft.EntityFrameworkCore.Abstractions", - "version": "9.0.12", - "hash": "sha256-52OUOGyGUXiwdjWHm7bXbdTmJ1hyphBrrXfFQebptOU=" + "version": "9.0.15", + "hash": "sha256-JISfrDTChiNqsXiwIh9hMOjLTUJcdkakFPjUqC3IXb4=" }, { "pname": "Microsoft.EntityFrameworkCore.Analyzers", - "version": "9.0.12", - "hash": "sha256-RNwUiYCSp/DxNEw+cNO51jFbN1H6jRtTs4XQAcc629E=" + "version": "9.0.15", + "hash": "sha256-8/WBMCzYsfpJXLzH70Z1Yz4RUjHWf6vWBBMVb3VwEjM=" }, { "pname": "Microsoft.EntityFrameworkCore.Design", - "version": "9.0.12", - "hash": "sha256-ulEXCCNkXc3tLSHKqd6tXhj5txfuRL1MTxZNS1tQHnc=" + "version": "9.0.15", + "hash": "sha256-4SPaldOH+RASmKSfLGViFf9gzZ3OsAvpBrm5TReqcn4=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", @@ -466,8 +456,8 @@ }, { "pname": "Microsoft.EntityFrameworkCore.Relational", - "version": "9.0.12", - "hash": "sha256-PNNKkfu7qB1oZDTI3QvT9TUk5EyR1YRriEznha4Q6+M=" + "version": "9.0.15", + "hash": "sha256-Z/HgAgCHY2nWaOOWh5AYDTn1CpEZyNQJDOFv1GNlvp4=" }, { "pname": "Microsoft.EntityFrameworkCore.Relational", @@ -476,13 +466,13 @@ }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite", - "version": "9.0.12", - "hash": "sha256-CMrv+8yvKwUj3dHBkdARBfRAbk+lpngXaLeRKsT3Nck=" + "version": "9.0.15", + "hash": "sha256-Ydym7NoDB8wADqoG5k5fTT81Dlcqe5yyfSCfknQxz1M=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", - "version": "9.0.12", - "hash": "sha256-XyBi4Sf3r9xzgbWWhSaxXMq9L9l7jhl0Uouql/yLnAQ=" + "version": "9.0.15", + "hash": "sha256-j8y6Iy2M+56wWXdLBo6ZDWk6UlA128kdrsAh9VBDnRg=" }, { "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core", @@ -506,28 +496,28 @@ }, { "pname": "Microsoft.Extensions.ApiDescription.Server", - "version": "10.0.2", - "hash": "sha256-3xz0RLS2+2wI6MI58VLRC5/gnEI+WpTAvPA56AZlE4E=" + "version": "10.0.7", + "hash": "sha256-tqh27mFfF2GzXLCSSeX0uEQ9yXVuhlOZDHo3rJVLwKw=" }, { "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "10.0.2", - "hash": "sha256-nKmQuZTt1g5/8gBajo7wdCV64kdCucdiQR8JTt7ZZb0=" + "version": "10.0.7", + "hash": "sha256-u3pHlFaDPeY2v89jNYLiHUQ2aGMKpe5wpXZUt8hkgdE=" }, { "pname": "Microsoft.Extensions.Caching.Abstractions", - "version": "9.0.12", - "hash": "sha256-5InZVZkpQztuUmMWSFtzanp9zPKfN1gb8Id0kNuaops=" + "version": "9.0.15", + "hash": "sha256-x10lmXDYMA3mUS71ujHYKvDJSToDGVp5ajvxV0QaHuE=" }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "10.0.2", - "hash": "sha256-sRUF7DM0s1yzZnfjM/hF9A/IysE6Er23gZ6jST+RWh0=" + "version": "10.0.7", + "hash": "sha256-8qXL1F5gE9OZUEp/9pNVT33hjRMVAPt4eovT1NesKoQ=" }, { "pname": "Microsoft.Extensions.Caching.Memory", - "version": "9.0.12", - "hash": "sha256-jRs6ObQ4MmhCt0JoCSqlMLLjmPPu1uKnUGUncTjfFvg=" + "version": "9.0.15", + "hash": "sha256-nlXdfEfziMtU3cEyadBlwU2ev3d+KtKSt9Sskgejteg=" }, { "pname": "Microsoft.Extensions.Caching.Memory", @@ -541,13 +531,13 @@ }, { "pname": "Microsoft.Extensions.Configuration", - "version": "10.0.1", - "hash": "sha256-7xdHie4uHwoGZz5yUT4vWg2EWvkLvsSzItWCoqm4dTM=" + "version": "10.0.2", + "hash": "sha256-dBJAKDyp/sm+ZSMQfH0+4OH8Jnv1s20aHlWS6HNnH+c=" }, { "pname": "Microsoft.Extensions.Configuration", - "version": "10.0.2", - "hash": "sha256-dBJAKDyp/sm+ZSMQfH0+4OH8Jnv1s20aHlWS6HNnH+c=" + "version": "10.0.7", + "hash": "sha256-2RqDs7+dXtGY78E5jSd1qyKu+dMQkbzv+oMY09SEJm0=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", @@ -556,13 +546,13 @@ }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "10.0.1", - "hash": "sha256-s4PDp+vtzdxKIxnOT3+dDRoTDopyl8kqmmw4KDnkOtQ=" + "version": "10.0.2", + "hash": "sha256-P+0kaDGO+xB9KxF9eWHDJ4hzi05sUGM/uMNEX5NdBTE=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "10.0.2", - "hash": "sha256-P+0kaDGO+xB9KxF9eWHDJ4hzi05sUGM/uMNEX5NdBTE=" + "version": "10.0.7", + "hash": "sha256-MnUJzZYnl089xuVi6kpt9kymBIvYun9U+Itd12dM5Co=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", @@ -571,8 +561,8 @@ }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "9.0.12", - "hash": "sha256-FYIGDiv0aVApHCpoVQs4o9sWeFZhXb3XfK/zWXYlH1g=" + "version": "9.0.15", + "hash": "sha256-oiFKtv9fTTQrlk4C/fMY0Jp0ZcxlbvN2WEsMVfPw9J8=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", @@ -586,13 +576,13 @@ }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "10.0.1", - "hash": "sha256-fiqTHE6EfaUXICaVrWzQEU/K6GjQNac6yRNErig6wRk=" + "version": "10.0.2", + "hash": "sha256-resI9gIxHh2cc+258/i+TjW8xxzKf4ZBTLIcWAMEYz0=" }, { "pname": "Microsoft.Extensions.Configuration.Binder", - "version": "10.0.2", - "hash": "sha256-resI9gIxHh2cc+258/i+TjW8xxzKf4ZBTLIcWAMEYz0=" + "version": "10.0.7", + "hash": "sha256-lU4G801+Cy3ua+S2slY5UVHOPXdF0I7r3lYX38mQSPw=" }, { "pname": "Microsoft.Extensions.DependencyInjection", @@ -601,24 +591,24 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "10.0.2", - "hash": "sha256-/9UWQRAI2eoocnJWWf1ktnAx/1Gt65c16fc0Xqr9+CQ=" + "version": "10.0.7", + "hash": "sha256-dICogdaqa5mHqyvFA0lTomFa39Dqm4nn7Pit6qi6eQY=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.12", - "hash": "sha256-pNKpg5UELjrn4Tm9s0aJigCX7qJ/JeqboU7TY3k+jUo=" - }, - { - "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "10.0.1", - "hash": "sha256-zNUpau51ds7iQTaSUTFtyTHIUoinYc129W50CnufMdQ=" + "version": "9.0.15", + "hash": "sha256-9GklcF6RO6QPZTSLzCe/Vy7mPLJIq4lbHhQ9xg+Nvlo=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "10.0.2", "hash": "sha256-UF9T13V5SQxJy2msfLmyovLmitZrjJayf8gHH+uK2eg=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "10.0.7", + "hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk=" + }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "8.0.0", @@ -631,8 +621,8 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "9.0.12", - "hash": "sha256-EZt7Vjl0dll6GZOVCTfC2cYxAG5IWtJHeOGlDJ7rHTg=" + "version": "9.0.15", + "hash": "sha256-hszOr6dqOMuiuWPlIbBvqtay42oZfeWtwqX92rvM2MI=" }, { "pname": "Microsoft.Extensions.DependencyModel", @@ -641,23 +631,18 @@ }, { "pname": "Microsoft.Extensions.DependencyModel", - "version": "9.0.12", - "hash": "sha256-CMh5AhCkjIzS0BP+GKael2eIoDSpyXsipWo/M7pcT8g=" + "version": "9.0.15", + "hash": "sha256-g8Fe7eV3NX5av6rRA9nlvuf8Pc+0ht7eiVQ8YLG+T2o=" }, { "pname": "Microsoft.Extensions.DependencyModel", "version": "9.0.9", "hash": "sha256-0ygY8JLOIKuYFwwdVCtDl8/8fV5IC9JgivfzXsjXXsI=" }, - { - "pname": "Microsoft.Extensions.DiagnosticAdapter", - "version": "3.1.32", - "hash": "sha256-moN7Vt47IZ0ZHRMjW+Y1Vbn/7ekvkj9GSm4yjIeAGnI=" - }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "10.0.2", - "hash": "sha256-Zb/qJA0cZYiPQO7I3AegZCcNT0aJlKTycUP11Mqbm6o=" + "version": "10.0.7", + "hash": "sha256-Sd0ZsXgO7w/35vOKN1B0CZdcIcMJnf/Z/8POSikTyRk=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", @@ -666,8 +651,8 @@ }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "10.0.2", - "hash": "sha256-Aob6wq51LdquE7SkkxtCzcuHBKWrJcb3Ebi/dU3aqA4=" + "version": "10.0.7", + "hash": "sha256-ocntk68Qa3ccHGEnzmZuKdBWdQEnp4PgwJk63bSRjDA=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", @@ -676,8 +661,8 @@ }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "10.0.2", - "hash": "sha256-tibCkkT9WliU2E/i0ufx7/Va6H6QZX4hR/1oUp8ecgQ=" + "version": "10.0.7", + "hash": "sha256-ibxSdxibq1UKOo4Mz+zthbZd0UUFipnJNb0hPwvEXCA=" }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", @@ -686,24 +671,19 @@ }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "10.0.2", - "hash": "sha256-mkeKUXepn4bfEdZFXdURmNEFdGiHQdpcxnm6joG+pUA=" + "version": "10.0.7", + "hash": "sha256-S1WAgBHPi7H71uQUGyl2aG/IITgYfVNznyXsFrRe/kE=" }, { "pname": "Microsoft.Extensions.Http", - "version": "10.0.2", - "hash": "sha256-0q9E0HO4YIqUs9ceZpY+nMKtdqdtncTbOjyEOlYdWHs=" + "version": "10.0.7", + "hash": "sha256-cbTDyODUPitTBOn88A5R5/QGPzOTCT7qeyP2gG6WOS0=" }, { "pname": "Microsoft.Extensions.Logging", "version": "10.0.0", "hash": "sha256-P+zPAadLL63k/GqK34/qChqQjY9aIRxZfxlB9lqsSrs=" }, - { - "pname": "Microsoft.Extensions.Logging", - "version": "10.0.1", - "hash": "sha256-zuLP3SIpCToMOlIPOEv3Kq8y/minecd8k8GSkxFo13E=" - }, { "pname": "Microsoft.Extensions.Logging", "version": "10.0.2", @@ -711,8 +691,13 @@ }, { "pname": "Microsoft.Extensions.Logging", - "version": "9.0.12", - "hash": "sha256-9QhfuxEeAiRoP6rYPs2TZY3N/BAd3AgHGwc1wEIcy6o=" + "version": "10.0.7", + "hash": "sha256-AUOet0nWZHB132XCPuyUp5xTFNnWjHhoOtzooFcXHk4=" + }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "9.0.15", + "hash": "sha256-V4ylLCMDJnQzmbR+20+NUlXXw6a3SpGn5VIZ1eCrjuU=" }, { "pname": "Microsoft.Extensions.Logging", @@ -726,13 +711,13 @@ }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "10.0.1", - "hash": "sha256-NRk0feNE1fgi/hyO0AVDbSGJQRT+9yte6Lpm4Hz/2Bs=" + "version": "10.0.2", + "hash": "sha256-ndKGzq8+2J/hvaIULwBui0L/jDyMQTAY24j+ohX5VX8=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "10.0.2", - "hash": "sha256-ndKGzq8+2J/hvaIULwBui0L/jDyMQTAY24j+ohX5VX8=" + "version": "10.0.7", + "hash": "sha256-/ITLUXgcs5tRDdeileNlmNB92V25CRd1FGBocChJj0g=" }, { "pname": "Microsoft.Extensions.Logging.Abstractions", @@ -746,34 +731,29 @@ }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "9.0.12", - "hash": "sha256-pl+0ezSkx+GND5pH2gtvhdMiCPodD1YvNP7wl4gDQt4=" + "version": "9.0.15", + "hash": "sha256-n8lNcXF+LGLOfYGn6eQ8iFO6eV+XyP2PjVknG73sQbM=" }, { "pname": "Microsoft.Extensions.Logging.Configuration", - "version": "10.0.1", - "hash": "sha256-/7ywcFsEmmQzWEcIvxoGAYHF0oDSXV/LTDAiW/MNQtg=" + "version": "10.0.2", + "hash": "sha256-eSfmagvrcdRVmTXEdzfvWEDNBewB/YClOGSDq4gThk0=" }, { "pname": "Microsoft.Extensions.Logging.Console", - "version": "10.0.1", - "hash": "sha256-m/E02c5NSCYyH4THNKxpnsi3Kp8gqOi2aPrfXx7sQ9s=" + "version": "10.0.2", + "hash": "sha256-mfaypUwMZxEIKBfnmzhnCScC/uPpZBRYN+/2SNcxcu4=" }, { "pname": "Microsoft.Extensions.Logging.TraceSource", - "version": "10.0.1", - "hash": "sha256-NS7P5jo7dtiH7DmyyipTIfaRf4ZwEJLU2UVG+4hlFSE=" + "version": "10.0.2", + "hash": "sha256-iD2epXLjKr41et5vJJTzLTxm+GzVxbAUMrwRm9jmH1c=" }, { "pname": "Microsoft.Extensions.Options", "version": "10.0.0", "hash": "sha256-j5MOqZSKeUtxxzmZjzZMGy0vELHdvPraqwTQQQNVsYA=" }, - { - "pname": "Microsoft.Extensions.Options", - "version": "10.0.1", - "hash": "sha256-vBiSS1vqAC7eDrpJNT4H3A9qLikCSAepnNRbry0mKnk=" - }, { "pname": "Microsoft.Extensions.Options", "version": "10.0.2", @@ -781,19 +761,24 @@ }, { "pname": "Microsoft.Extensions.Options", - "version": "9.0.12", - "hash": "sha256-WuEpn1zvPWdS+TTu30s1Z3KMUt+4GpdwRpzqrhtfd60=" + "version": "10.0.7", + "hash": "sha256-XtyfdZ26kjnuCF/YHbdGdsIeR/nxSW7yyQZ04sOa9RU=" }, { - "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "10.0.1", - "hash": "sha256-1CNSVXZ3RAH4vzbYDqcQHl9c/YBhuSfrFUXCLIx5/rY=" + "pname": "Microsoft.Extensions.Options", + "version": "9.0.15", + "hash": "sha256-p1ilUJEqSUSAx3mlTmMm6Jh3A9QvjL+L5D34wugbWIc=" }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", "version": "10.0.2", "hash": "sha256-WJahsWyT5wYdLPEJufHKpb3l/dl7D2iw2SnMK0Jr53U=" }, + { + "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", + "version": "10.0.7", + "hash": "sha256-6UBnB1ouWwRkVEGt5xLfXZvpYsCQQJijKvBlBCJOmmM=" + }, { "pname": "Microsoft.Extensions.Primitives", "version": "10.0.0", @@ -801,8 +786,8 @@ }, { "pname": "Microsoft.Extensions.Primitives", - "version": "10.0.2", - "hash": "sha256-8Ccrjjv9cFVf9RyCc7GS/Byt8+DXdSNea0UX3A5BEdA=" + "version": "10.0.7", + "hash": "sha256-cQBhL1IkRl1lxaZImAZBVS39CfWkB+J6+hJVEVBE35I=" }, { "pname": "Microsoft.Extensions.Primitives", @@ -811,8 +796,8 @@ }, { "pname": "Microsoft.Extensions.Primitives", - "version": "9.0.12", - "hash": "sha256-aJBpI8kad6jm0Pno4WQWJZnbM2E3zayjfa8gvoMXI7I=" + "version": "9.0.15", + "hash": "sha256-t5zLMH4Vkmuufk53RX0K/sHo7Yy16TuUd8fUd6de0N8=" }, { "pname": "Microsoft.Identity.Client", @@ -921,8 +906,8 @@ }, { "pname": "MudBlazor", - "version": "8.15.0", - "hash": "sha256-I6kJEvND0i3I/amZBhDF8LjYeGGWuMwoSLiev6BS3UM=" + "version": "9.4.0", + "hash": "sha256-PsWZYhD35e+W0iBvRN0rv6PspDr615MNBrYGHNIfcNY=" }, { "pname": "MySqlConnector", @@ -936,13 +921,13 @@ }, { "pname": "NCalc.Core", - "version": "5.11.0", - "hash": "sha256-THgAix81mZxztHNMf5JlTPUGbcs1ZuRS3EVM7eFHseg=" + "version": "5.12.0", + "hash": "sha256-TxeBjIq33bNgHGWgJRjdKmhnxr3lscEFmL59bBNG0UU=" }, { "pname": "NCalcSync", - "version": "5.11.0", - "hash": "sha256-Kui0K2WuLS0filTnpdcA3/H/XqqDOjtKms97WqbulEw=" + "version": "5.12.0", + "hash": "sha256-Hraol6T5U8B8Z1DrincdjJZREjkt9ZbBPAH7wtZN4a4=" }, { "pname": "NETStandard.Library", @@ -1016,8 +1001,8 @@ }, { "pname": "Parlot", - "version": "1.5.6", - "hash": "sha256-Ffbs7IpgN0aOKScBe64PGySnzWxapVSuM73fQmt+2nU=" + "version": "1.5.7", + "hash": "sha256-mvAu74ty4uRP3f+Yy4R/HuhJKApOx/6ASl8nJ1mzvqM=" }, { "pname": "Pomelo.EntityFrameworkCore.MySql", @@ -1026,23 +1011,23 @@ }, { "pname": "Refit", - "version": "9.0.2", - "hash": "sha256-FTq+jJLV9ow3hTrzTBEYwuAibxY6m0XgExNeIGoAAK4=" + "version": "10.1.6", + "hash": "sha256-KC0PVsbqx5RHZxItYgJaBeUQBlPLQbTx643BzEhXIc0=" }, { "pname": "Refit.HttpClientFactory", - "version": "9.0.2", - "hash": "sha256-qxUm0NlJqoOPFRTu7ArdcSR696t5zCB+BniJv1+Xdkc=" + "version": "10.1.6", + "hash": "sha256-/fkHB7cFXIRVUDnznQVJBgpwLS8KdhtiASF78xp4C8Q=" }, { "pname": "Refit.Newtonsoft.Json", - "version": "9.0.2", - "hash": "sha256-cxZtCv7gecMVIVzDrgjMBg81dEAq6DT9ccR10SKuFV4=" + "version": "10.1.6", + "hash": "sha256-SJq065kLgo9cJn5sg64hK+7dMxezJbdQJdlp4U1M/1M=" }, { "pname": "Refit.Xml", - "version": "9.0.2", - "hash": "sha256-FNP7WAnsjncwdSvj4j7mxP2I+O3TNiYzlaTYVBlMWEo=" + "version": "10.1.6", + "hash": "sha256-VgPvKHxAB+X5hkD+eapzDcgB8Z+0ZIeX/D14vGRhrCU=" }, { "pname": "RichTextKit.Stbear", @@ -1051,13 +1036,13 @@ }, { "pname": "Scalar.AspNetCore", - "version": "2.12.32", - "hash": "sha256-0EZAD43NpMpX3P8quuctTLSGBxwjxxbyfQodo0e+nII=" + "version": "2.14.10", + "hash": "sha256-NojV2iMXKFbZTypeqLhgNdebb9hGLsFyDjkHrjSOryM=" }, { "pname": "Scriban.Signed", - "version": "6.5.2", - "hash": "sha256-rnhmugQoX+lI0sO+V3KIAsQ9kWs0ow7EpEriQLCYAQw=" + "version": "7.1.0", + "hash": "sha256-bUADaUvCUz4uOx/zpiG5IaQKHlWRLiUmCg+90CTuJgI=" }, { "pname": "Serilog", @@ -1069,6 +1054,11 @@ "version": "4.3.0", "hash": "sha256-jyIy4BjsyFXge3aO4GRFAdnX4/rz1MHfBkBDIpCDsTw=" }, + { + "pname": "Serilog", + "version": "4.3.1", + "hash": "sha256-TY+GaQYnyDfOGl0gi67xDyUMOuV/mjz8BU66/UsmStI=" + }, { "pname": "Serilog.AspNetCore", "version": "10.0.0", @@ -1131,8 +1121,8 @@ }, { "pname": "SkiaSharp", - "version": "3.119.1", - "hash": "sha256-TIVr52NpQ9cab5eJCcH/OYHjNOTKhwCqpClK2c8S4TM=" + "version": "3.119.2", + "hash": "sha256-A9F397K5FfLeOsNZacKmUh4IU/WMK60B4Z6TEtS/oqo=" }, { "pname": "SkiaSharp.HarfBuzz", @@ -1146,18 +1136,18 @@ }, { "pname": "SkiaSharp.NativeAssets.Linux.NoDependencies", - "version": "3.119.1", - "hash": "sha256-SprThyApThbDoeTn/JaaS7TKdm9SkMoVO8V8HuCyppI=" + "version": "3.119.2", + "hash": "sha256-79BCLZAYjfHP1DZKgB+hsyyBlhnyZQPi+Swvs0RYnng=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "3.119.1", - "hash": "sha256-0QJGcO91MWLSeQpE4ZNn/KUVoHRcrPeDbKklxCVB00o=" + "version": "3.119.2", + "hash": "sha256-KEeGqSiyAiMbzLgH/0JkwUz/pWcL49gYB1T1YLkMPaI=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "3.119.1", - "hash": "sha256-ySPkn8SrShOqhihC33EJ4HJt9desDISC4gAI4FQBi2U=" + "version": "3.119.2", + "hash": "sha256-CI6dg+MlxX8t+vbnkxtd5QE3xalMKkA8LUSudxg7TNU=" }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", @@ -1196,8 +1186,8 @@ }, { "pname": "System.CommandLine", - "version": "2.0.2", - "hash": "sha256-PK3wKHjY8FHkPV75Z4ouxKU67WcuVSiMFjAkBs+iSAo=" + "version": "2.0.7", + "hash": "sha256-CGm46Hk7eZFvIySEynE+A0Hs5EXDs2FNKKhk/rU77jM=" }, { "pname": "System.Composition", @@ -1311,18 +1301,18 @@ }, { "pname": "Testably.Abstractions", - "version": "10.0.0", - "hash": "sha256-2rixQaYGhCM+NjmkxgOBNjJMFcNHr+3TPP+vsRUMj4w=" + "version": "10.2.0", + "hash": "sha256-5qGJPTlon9GBIpXa8vmZOjjPGMTnbXIDzORY10FEl1w=" }, { "pname": "Testably.Abstractions.FileSystem.Interface", - "version": "10.0.0-pre.1", - "hash": "sha256-UO/Ly7Qd7AqYOIP52pS1YYoaQgOzzZ5745naHMqULZs=" + "version": "10.2.0", + "hash": "sha256-4gUlDhO39+eBA/5xbraFpMztu4fcr0SzB+N4amLemQ4=" }, { "pname": "Testably.Abstractions.Interface", - "version": "10.0.0-pre.1", - "hash": "sha256-Te2+jj1jSleYGEJHlrmj9GYTht62mY14E5WCKDHx4pQ=" + "version": "10.2.0", + "hash": "sha256-dNazu3BDDWJp/4O7+Rx2MTPDGypQa8p7LJ3fTAWaP7M=" }, { "pname": "TimeSpanParserUtil", @@ -1341,8 +1331,8 @@ }, { "pname": "WebMarkupMin.Core", - "version": "2.20.1", - "hash": "sha256-6ze4MOSfIKdvMJsroQRtESB8KG5XogO3xk4qOSkHpXQ=" + "version": "2.21.0", + "hash": "sha256-k51tTFcdL9Bwsg3gA51ZswGxDtdBFb22BAj9wbyZu1E=" }, { "pname": "Winista.MimeDetect", @@ -1351,7 +1341,7 @@ }, { "pname": "YamlDotNet", - "version": "16.3.0", - "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" + "version": "17.1.0", + "hash": "sha256-Zdlw62rVud2U94BQKqrp5OFQiDcQ9rRrKeaVnNxREjY=" } ] diff --git a/pkgs/by-name/er/ersatztv/package.nix b/pkgs/by-name/er/ersatztv/package.nix index 8022bb8c3932..fa16d4a270ef 100644 --- a/pkgs/by-name/er/ersatztv/package.nix +++ b/pkgs/by-name/er/ersatztv/package.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "ersatztv"; - version = "26.3.0"; + version = "26.5.1"; src = fetchFromGitHub { owner = "ErsatzTV"; - repo = "ErsatzTV"; + repo = "legacy"; rev = "v${version}"; - sha256 = "sha256-yFGMkTI+IQs3WTOQzxhqj3ownENsIzLqrDr3nWurzfA="; + sha256 = "sha256-2w+4xppj3E8H6WXea/iuNfloUmBsFQKDBpTnUn3RWvE="; }; postPatch = '' # Remove config of development tools that don't end up in diff --git a/pkgs/by-name/er/ersatztv/update.sh b/pkgs/by-name/er/ersatztv/update.sh index bfacbdfea836..54fe65f4ac21 100755 --- a/pkgs/by-name/er/ersatztv/update.sh +++ b/pkgs/by-name/er/ersatztv/update.sh @@ -3,7 +3,7 @@ set -euo pipefail -latestVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/ersatztv/ersatztv/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" +latestVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/ersatztv/legacy/releases?per_page=1" | jq -r ".[0].tag_name" | sed 's/^v//')" currentVersion=$(nix-instantiate --eval -E "with import ./. {}; ersatztv.version or (lib.getVersion ersatztv)" | tr -d '"') if [[ "$currentVersion" == "$latestVersion" ]]; then From 93a095e5c6cb7accaeb35b3ec77b03aaaeec0932 Mon Sep 17 00:00:00 2001 From: zendo Date: Mon, 11 May 2026 10:27:10 +0800 Subject: [PATCH 0236/1079] comigo: init at 1.2.30 --- pkgs/by-name/co/comigo/package.nix | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/co/comigo/package.nix diff --git a/pkgs/by-name/co/comigo/package.nix b/pkgs/by-name/co/comigo/package.nix new file mode 100644 index 000000000000..d9909a213dc6 --- /dev/null +++ b/pkgs/by-name/co/comigo/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule (finalAttrs: { + pname = "comigo"; + version = "1.2.30"; + + src = fetchFromGitHub { + owner = "yumenaka"; + repo = "comigo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-JS+KgXmYEx3V5FnFqcDwFonxRHg5f5n8uH4MtpT0e3g="; + }; + + vendorHash = "sha256-OUmqbev7Eq79co8RdmwOF6fqcOWwwm6Kx4fbvd2DJU4="; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + ]; + + __structuredAttrs = true; + + meta = { + description = "Simple and Efficient Comic Reader"; + homepage = "https://github.com/yumenaka/comigo"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zendo ]; + mainProgram = "comigo"; + }; +}) From 36ba49d58972140f696663e0c3a7a820c350546d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 11 Mar 2026 22:51:16 -0400 Subject: [PATCH 0237/1079] gdcm: 3.2.2 -> 3.2.6 --- ...ylosslessarray-in-TestTransferSyntax.patch | 14 -- .../gd/gdcm/fix-vtk-deprecated-api.patch | 184 ------------------ pkgs/by-name/gd/gdcm/package.nix | 12 +- 3 files changed, 2 insertions(+), 208 deletions(-) delete mode 100644 pkgs/by-name/gd/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch delete mode 100644 pkgs/by-name/gd/gdcm/fix-vtk-deprecated-api.patch diff --git a/pkgs/by-name/gd/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch b/pkgs/by-name/gd/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch deleted file mode 100644 index a3701135c510..000000000000 --- a/pkgs/by-name/gd/gdcm/add-missing-losslylosslessarray-in-TestTransferSyntax.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx -index 7ad350d..6f962ce 100644 ---- a/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx -+++ b/Testing/Source/DataStructureAndEncodingDefinition/Cxx/TestTransferSyntax.cxx -@@ -43,6 +43,9 @@ static const int losslylosslessarray[][3] = { - { 1, 0, 1 }, // MPEG2MainProfileHighLevel - { 1, 0, 1 }, // MPEG4AVCH264HighProfileLevel4_1 - { 1, 0, 1 }, // MPEG4AVCH264BDcompatibleHighProfileLevel4_1 -+ { 0, 1, 1 }, // HTJ2KLossless -+ { 0, 1, 1 }, // HTJ2KRPCLLossless -+ { 1, 0, 1 }, // HTJ2K - }; - - static int TestTransferSyntaxAll() diff --git a/pkgs/by-name/gd/gdcm/fix-vtk-deprecated-api.patch b/pkgs/by-name/gd/gdcm/fix-vtk-deprecated-api.patch deleted file mode 100644 index 211226895054..000000000000 --- a/pkgs/by-name/gd/gdcm/fix-vtk-deprecated-api.patch +++ /dev/null @@ -1,184 +0,0 @@ -diff --git a/Utilities/VTK/Applications/gdcm2vtk.cxx b/Utilities/VTK/Applications/gdcm2vtk.cxx -index 344aec0df..c1cd4b43d 100644 ---- a/Utilities/VTK/Applications/gdcm2vtk.cxx -+++ b/Utilities/VTK/Applications/gdcm2vtk.cxx -@@ -498,7 +498,7 @@ int main(int argc, char *argv[]) - { - imgreader->SetFileLowerLeft( lowerleft ); - if( names->GetNumberOfValues() == 1 ) -- imgreader->SetFileName( names->GetValue(0) ); -+ imgreader->SetFileName( names->GetValue(0).c_str() ); - else - imgreader->SetFileNames(names); - imgreader->Update(); -diff --git a/Utilities/VTK/Applications/gdcmviewer.cxx b/Utilities/VTK/Applications/gdcmviewer.cxx -index 3ed4778f8..58236a6a5 100644 ---- a/Utilities/VTK/Applications/gdcmviewer.cxx -+++ b/Utilities/VTK/Applications/gdcmviewer.cxx -@@ -321,7 +321,7 @@ void ExecuteViewer(TViewer *viewer, vtkStringArray *filenames) - vtkGDCMImageReader *reader = vtkGDCMImageReader::New(); - if( filenames->GetSize() == 1 ) // Backward compatible... - { -- reader->SetFileName( filenames->GetValue(0) ); -+ reader->SetFileName( filenames->GetValue(0).c_str() ); - } - else - { -diff --git a/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx b/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx -index fa1d7d895..00d9f3845 100644 ---- a/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx -+++ b/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx -@@ -113,7 +113,7 @@ int TestvtkGDCMImageWrite2(const char *filename, bool verbose = false) - // Need to check we can still read those files back: - for(int file=0; fileGetNumberOfValues(); ++file) - { -- const char *fname = filenames->GetValue(file); -+ const char *fname = filenames->GetValue(file).c_str(); - gdcm::ImageReader r; - //r.SetFileName( gdcmfile.c_str() ); - r.SetFileName( fname ); -diff --git a/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader.cxx b/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader.cxx -index 8b253ec83..1c83ed417 100644 ---- a/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader.cxx -+++ b/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader.cxx -@@ -170,7 +170,7 @@ int TestvtkGDCMThreadedImageRead(const char *filename, bool verbose = false) - assert( sarray->GetNumberOfValues() == (int)nfiles ); - reader->SetFileNames( sarray ); - sarray->Delete(); -- refimage = sarray->GetValue( 0 ); // Ok since sarray is ref count -+ refimage = sarray->GetValue( 0 ).c_str(); // Ok since sarray is ref count - } - else - { -diff --git a/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader2.cxx b/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader2.cxx -index 5151893e8..22dd4fd57 100644 ---- a/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader2.cxx -+++ b/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader2.cxx -@@ -160,7 +160,7 @@ int TestvtkGDCMThreadedImageRead2(const char *filename, bool verbose = false) - assert( sarray->GetNumberOfValues() == (int)nfiles ); - reader->SetFileNames( sarray ); - sarray->Delete(); -- refimage = sarray->GetValue( 0 ); // Ok since sarray is ref count -+ refimage = sarray->GetValue( 0 ).c_str(); // Ok since sarray is ref count - } - else - { -diff --git a/Utilities/VTK/vtkGDCMImageReader.cxx b/Utilities/VTK/vtkGDCMImageReader.cxx -index c62034300..463c3879b 100644 ---- a/Utilities/VTK/vtkGDCMImageReader.cxx -+++ b/Utilities/VTK/vtkGDCMImageReader.cxx -@@ -608,7 +608,7 @@ ComputePixelTypeFromFiles(const char *inputfilename, vtkStringArray *filenames, - // FIXME a gdcm::Scanner would be much faster here: - for(int i = 0; i < filenames->GetNumberOfValues(); ++i ) - { -- const char *filename = filenames->GetValue( i ); -+ const char *filename = filenames->GetValue( i ).c_str(); - gdcm::ImageReader reader; - reader.SetFileName( filename ); - if( !reader.Read() ) -@@ -703,7 +703,7 @@ int vtkGDCMImageReader::RequestInformationCompat() - } - else if ( this->FileNames && this->FileNames->GetNumberOfValues() > 0 ) - { -- filename = this->FileNames->GetValue( 0 ); -+ filename = this->FileNames->GetValue( 0 ).c_str(); - } - else - { -@@ -1459,7 +1459,7 @@ int vtkGDCMImageReader::RequestDataCompat() - for(int j = dext[4]; !this->AbortExecute && j <= dext[5]; ++j) - { - assert( j >= 0 && j <= this->FileNames->GetNumberOfValues() ); -- const char *filename = this->FileNames->GetValue( j ); -+ const char *filename = this->FileNames->GetValue( j ).c_str(); - int load = this->LoadSingleFile( filename, pointer, len ); - if( !load ) - { -diff --git a/Utilities/VTK/vtkGDCMImageReader2.cxx b/Utilities/VTK/vtkGDCMImageReader2.cxx -index 266c1270a..4976f0190 100644 ---- a/Utilities/VTK/vtkGDCMImageReader2.cxx -+++ b/Utilities/VTK/vtkGDCMImageReader2.cxx -@@ -388,7 +388,7 @@ ComputePixelTypeFromFiles(const char *inputfilename, vtkStringArray *filenames, - // FIXME a gdcm::Scanner would be much faster here: - for(int i = 0; i < filenames->GetNumberOfValues(); ++i ) - { -- const char *filename = filenames->GetValue( i ); -+ const char *filename = filenames->GetValue( i ).c_str(); - gdcm::ImageReader reader; - reader.SetFileName( filename ); - if( !reader.Read() ) -@@ -480,7 +480,7 @@ int vtkGDCMImageReader2::RequestInformationCompat() - } - else if ( this->FileNames && this->FileNames->GetNumberOfValues() > 0 ) - { -- filename = this->FileNames->GetValue( 0 ); -+ filename = this->FileNames->GetValue( 0 ).c_str(); - } - else - { -@@ -1177,7 +1177,7 @@ int vtkGDCMImageReader2::RequestDataCompat() - for(int j = outExt[4]; !this->AbortExecute && j <= outExt[5]; ++j) - { - assert( j >= 0 && j <= this->FileNames->GetNumberOfValues() ); -- const char *filename = this->FileNames->GetValue( j ); -+ const char *filename = this->FileNames->GetValue( j ).c_str(); - int load = this->LoadSingleFile( filename, pointer, len ); - vtkDebugMacro( "LoadSingleFile: " << filename ); - if( !load ) -diff --git a/Utilities/VTK/vtkGDCMImageWriter.cxx b/Utilities/VTK/vtkGDCMImageWriter.cxx -index 37e1245a5..e723d15b7 100644 ---- a/Utilities/VTK/vtkGDCMImageWriter.cxx -+++ b/Utilities/VTK/vtkGDCMImageWriter.cxx -@@ -255,7 +255,7 @@ int vtkGDCMImageWriter::RequestData( - { - if( this->FileNames->GetNumberOfValues() ) - { -- const char *filename = this->FileNames->GetValue(0); -+ const char *filename = this->FileNames->GetValue(0).c_str(); - return const_cast(filename); - } - return this->Superclass::GetFileName(); -@@ -1148,7 +1148,7 @@ int vtkGDCMImageWriter::WriteGDCMData(vtkImageData *data, int timeStep) - if( this->FileNames->GetNumberOfValues() ) - { - //int n = this->FileNames->GetNumberOfValues(); -- filename = this->FileNames->GetValue(k); -+ filename = this->FileNames->GetValue(k).c_str(); - } - else - { -diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader.cxx b/Utilities/VTK/vtkGDCMThreadedImageReader.cxx -index d50a3fee2..c531b8854 100644 ---- a/Utilities/VTK/vtkGDCMThreadedImageReader.cxx -+++ b/Utilities/VTK/vtkGDCMThreadedImageReader.cxx -@@ -592,7 +592,7 @@ void vtkGDCMThreadedImageReader::RequestDataCompat() - const char **filenames = new const char* [ nfiles ]; - for(unsigned int i = 0; i < nfiles; ++i) - { -- filenames[i] = this->FileNames->GetValue( i ); -+ filenames[i] = this->FileNames->GetValue( i ).c_str(); - //std::cerr << filenames[i] << std::endl; - } - ReadFiles((unsigned int)nfiles, filenames); -diff --git a/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx b/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx -index 2e6a2e932..72ce6453c 100644 ---- a/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx -+++ b/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx -@@ -71,7 +71,7 @@ vtkGDCMThreadedImageReader2::~vtkGDCMThreadedImageReader2() - //---------------------------------------------------------------------------- - const char *vtkGDCMThreadedImageReader2::GetFileName(int i) - { -- return this->FileNames->GetValue( i ); -+ return this->FileNames->GetValue( i ).c_str(); - } - - //---------------------------------------------------------------------------- -@@ -106,7 +106,7 @@ void vtkGDCMThreadedImageReader2Execute(vtkGDCMThreadedImageReader2 *self, - for( int i = outExt[4]; i <= outExt[5] && i < maxfiles; ++i ) - { - assert( i < maxfiles ); -- const char *filename = self->GetFileNames()->GetValue( i ); -+ const char *filename = self->GetFileNames()->GetValue( i ).c_str(); - //ReadOneFile( filename ); - //outData->GetPointData()->GetScalars()->SetName("GDCMImage"); - diff --git a/pkgs/by-name/gd/gdcm/package.nix b/pkgs/by-name/gd/gdcm/package.nix index e2241dfa9340..731f569d38b4 100644 --- a/pkgs/by-name/gd/gdcm/package.nix +++ b/pkgs/by-name/gd/gdcm/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, cmake, enableVTK ? true, vtk, @@ -20,22 +19,15 @@ stdenv.mkDerivation (finalAttrs: { pname = if enablePython then "python-gdcm" else "gdcm"; - version = "3.2.2"; + version = "3.2.6"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; tag = "v${finalAttrs.version}"; - hash = "sha256-iUJrXcVHdCmL5atm6in4KvgPXbYmAYFxM6TGoZeY9EE="; + hash = "sha256-8ZNq89a369mm/hPe0tywo4Tqzt65Xhb0pbEguy8CSsA="; }; - patches = [ - ./add-missing-losslylosslessarray-in-TestTransferSyntax.patch - # Fix vtk deprecated api, See https://docs.vtk.org/en/latest/release_details/9.3.html#id13. - # Upstream mailing list: https://sourceforge.net/p/gdcm/mailman/message/59197515. - ./fix-vtk-deprecated-api.patch - ]; - cmakeFlags = [ "-DGDCM_BUILD_APPLICATIONS=ON" "-DGDCM_BUILD_SHARED_LIBS=ON" From cabbf9ed387c1ece166fe83321b8f9209359d3b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 05:01:02 +0000 Subject: [PATCH 0238/1079] python3Packages.dataproperty: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/dataproperty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dataproperty/default.nix b/pkgs/development/python-modules/dataproperty/default.nix index 0b8ba76207b4..05de3a32b54d 100644 --- a/pkgs/development/python-modules/dataproperty/default.nix +++ b/pkgs/development/python-modules/dataproperty/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "dataproperty"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "thombashi"; repo = "dataproperty"; tag = "v${version}"; - hash = "sha256-IEEwdOcC9nKwVumWnjpZlqYKCFGwZebMh7nGdGVjibE="; + hash = "sha256-PLXF9g0VIkmsRLl5+KvXcbbwVwaJSYjWB7l8xz1mPZM="; }; build-system = [ setuptools-scm ]; From 6bc8ce5861d5f6d9e6df24bc44da24076f82573f Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 10 May 2026 23:05:41 -0600 Subject: [PATCH 0239/1079] balatro-mod-manager: fix build on aarch64-linux --- pkgs/by-name/ba/balatro-mod-manager/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/balatro-mod-manager/package.nix b/pkgs/by-name/ba/balatro-mod-manager/package.nix index 835a888d20e0..b23eb1e72286 100644 --- a/pkgs/by-name/ba/balatro-mod-manager/package.nix +++ b/pkgs/by-name/ba/balatro-mod-manager/package.nix @@ -50,7 +50,12 @@ rustPlatform.buildRustPackage (finalAttrs: { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-97O4DrnjZO2mhSrCQz9xbcRCSaxMNNa4NaLNPlmecJg="; + outputHash = + { + x86_64-linux = "sha256-97O4DrnjZO2mhSrCQz9xbcRCSaxMNNa4NaLNPlmecJg="; + aarch64-linux = "sha256-0H14Be8jhBwOBG2Ui8gYrnAcTtatLVsBxFVfTyzmutw="; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}"); }; cargoHash = "sha256-TPZf4jtv/3mIpe6ASzPkIusQC/iPFpYN51XiiH6pkZc="; @@ -92,12 +97,10 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; meta = { - # Rollup for ARM64 is broken with Node modules - broken = stdenv.hostPlatform.isAarch64; description = "A mod manager for the game Balatro"; homepage = "https://balatro-mod-manager.dasguney.com/"; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.linux; + platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.aarch64); maintainers = with lib.maintainers; [ mhdask ]; mainProgram = "BMM"; }; From 7b7892e1b1cc56f94fb8beb88fbbe6184f63f590 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 10 May 2026 23:07:00 -0600 Subject: [PATCH 0240/1079] balatro-mod-manager: add ryand56 as maintainer --- pkgs/by-name/ba/balatro-mod-manager/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ba/balatro-mod-manager/package.nix b/pkgs/by-name/ba/balatro-mod-manager/package.nix index b23eb1e72286..6f9a59f26eb5 100644 --- a/pkgs/by-name/ba/balatro-mod-manager/package.nix +++ b/pkgs/by-name/ba/balatro-mod-manager/package.nix @@ -101,7 +101,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://balatro-mod-manager.dasguney.com/"; license = lib.licenses.gpl3Plus; platforms = lib.intersectLists lib.platforms.linux (lib.platforms.x86_64 ++ lib.platforms.aarch64); - maintainers = with lib.maintainers; [ mhdask ]; + maintainers = with lib.maintainers; [ + mhdask + ryand56 + ]; mainProgram = "BMM"; }; }) From 3f846e0169178e89bf366a0e7f08e3407462941f Mon Sep 17 00:00:00 2001 From: Alex Galvin Date: Mon, 11 May 2026 02:06:41 -0400 Subject: [PATCH 0241/1079] bcachefs-tools: 1.38.2 -> 1.38.3 --- pkgs/by-name/bc/bcachefs-tools/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 9fc72267d488..faa4c82fbc70 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -5,6 +5,7 @@ pkg-config, libuuid, libsodium, + libunwind, keyutils, kmod, liburcu, @@ -29,18 +30,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.38.2"; + version = "1.38.3"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-zUrvqds6gkqZLV5BbwZDf+IsClNn8CwiC4VdAUO2CWY="; + hash = "sha256-DR/aGCfqXUOubVEVmeJYOiF71rMYRYq8k23EXqluh5k="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-vk5nI8CPYp9ux984yiFWRdOGWrabx/VWPNlgihuLCMM="; + hash = "sha256-aiLSgpK3wadrBvclrQrdCzCiSjLcxg58oeP6ijL+JbY="; }; postPatch = '' @@ -66,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: { keyutils lz4 libsodium + libunwind liburcu libuuid zstd From d16c2ccd8e7a4f1d15886c37b130ec963d6055a2 Mon Sep 17 00:00:00 2001 From: David Morgan Date: Mon, 11 May 2026 07:46:17 +0100 Subject: [PATCH 0242/1079] orbstack: 2.1.1-20026 -> 2.1.3-20115 --- pkgs/by-name/or/orbstack/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix index eb4049caceec..dbef9737c3c7 100644 --- a/pkgs/by-name/or/orbstack/package.nix +++ b/pkgs/by-name/or/orbstack/package.nix @@ -6,15 +6,15 @@ }: let inherit (stdenvNoCC.hostPlatform) system; - version = "2.1.1-20026"; + version = "2.1.3-20115"; sourceData = { aarch64-darwin = { arch = "arm64"; - hash = "sha256-GKQfdZlY4foJUWlrggtUeNPtc1P4ykhv6dAmoafZcgc="; + hash = "sha256-9JTbgE/Ehu8viOq5A9GGpph8eG3jmGj/iDQWpeuacxc="; }; x86_64-darwin = { arch = "amd64"; - hash = "sha256-x+748PKaqsnQqeqWIgihNipjztCSZkWluomDXlJgUTw="; + hash = "sha256-Wi76W+z5Xs66gjtyxUZIo+K3ziHb3GAn83k7k5Xopjk="; }; }; sources = lib.mapAttrs ( From b5300c75885c82ac36baecbc7c13f052016493e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 07:28:35 +0000 Subject: [PATCH 0243/1079] codebuff: 1.0.638 -> 1.0.674 --- pkgs/by-name/co/codebuff/package-lock.json | 8 ++++---- pkgs/by-name/co/codebuff/package.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 95a1910bbcd5..ccc934038cdb 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.638" + "codebuff": "^1.0.674" } }, "node_modules/@isaacs/fs-minipass": { @@ -30,9 +30,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.638", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.638.tgz", - "integrity": "sha512-AVjN8qPQ+7gZ30Y1NpdtycatSKg/K4FPRrgAr1Lc/tYQ7kmfTKopYpPiawF2Q+v3pO9K2jFNoVihvcLzEv+ewA==", + "version": "1.0.674", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.674.tgz", + "integrity": "sha512-xzsFsB2E/En+pPxIGKcA4V1Yc4ObVe9s3NXW1FQA/KYeTaGUp3IKIS49wp1pQ+rCjaQHkb8YCSrb7Zxq/DNmKg==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index d971428d85ff..9a56657fcce1 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "codebuff"; - version = "1.0.638"; + version = "1.0.674"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${finalAttrs.version}.tgz"; - hash = "sha256-Fyu2T3HGwKfECiw0zyRMH29iDAlrtpzvkoqswJiPl6Y="; + hash = "sha256-dWOeqO55A0ZyZyFgtl+aSXeD2EiQBoGPuqaecfgKNaY="; }; strictDeps = true; - npmDepsHash = "sha256-Wb0FbeuzkKg3ljirUFX2ZHx1WS1K2lyuha9qWUncsiI="; + npmDepsHash = "sha256-xFtWLqpzRdXN+JO2ueKqRWe/GaNE1yb2LFrFvAETcBU="; postPatch = '' cp ${./package-lock.json} package-lock.json From 1e9713de53efa91e528cb8626c743626d61c01f7 Mon Sep 17 00:00:00 2001 From: VZstless Date: Mon, 11 May 2026 16:50:35 +0800 Subject: [PATCH 0244/1079] numatop: adopt --- pkgs/by-name/nu/numatop/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/numatop/package.nix b/pkgs/by-name/nu/numatop/package.nix index 138b49c73e43..9037e46d048e 100644 --- a/pkgs/by-name/nu/numatop/package.nix +++ b/pkgs/by-name/nu/numatop/package.nix @@ -7,6 +7,7 @@ numactl, ncurses, check, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -34,12 +35,14 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "Tool for runtime memory locality characterization and analysis of processes and threads on a NUMA system"; mainProgram = "numatop"; - homepage = "https://01.org/numatop"; + homepage = "https://www.intel.com/content/www/us/en/developer/topic-technology/open/numatop/overview.html"; license = lib.licenses.bsd3; - maintainers = [ ]; + maintainers = with lib.maintainers; [ VZstless ]; platforms = [ "i686-linux" "x86_64-linux" From f27d0a3f65802690ce7d37c3965c4eec293a87c1 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Mon, 11 May 2026 10:57:22 +0200 Subject: [PATCH 0245/1079] readest: 0.10.6 -> 0.11.1 Changelog: https://github.com/readest/readest/releases/tag/v0.11.1 Diff: https://github.com/readest/readest/compare/v0.10.6...v0.11.1 --- pkgs/by-name/re/readest/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index 378c8b0159f7..f470a6f0b4c8 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -23,13 +23,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.10.6"; + version = "0.11.1"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-48POUgO6torvLJLXpVzDQLF5sZ2Ws+vhiI1x84+exAw="; + hash = "sha256-VS1YpSy9dw0Z6hOZRKhq/3Yl2+x+jxQf7VWXeDs2HIg="; fetchSubmodules = true; }; @@ -46,11 +46,11 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-4CO0ouas6TAZDaL2J8zr9wR28QB/DVN4y1Cqe8m1FEg="; + hash = "sha256-AnCxGeYaA5pY3tXA8e03fAXvU/mj4mBP0ZA3MUkodNo="; }; cargoRoot = "../.."; - cargoHash = "sha256-7wmqDGhtBHU9iOvLrsqGifCEuVdymdljlETkW7dThHA="; + cargoHash = "sha256-BGI1C8SSDjkqhkBhos1GVXMaIUpYmSmPgb6lTuZJSQs="; buildAndTestSubdir = "src-tauri"; From dbacac5678f3f800a68f9e33542d6aa12ef38bcb Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Mon, 11 May 2026 11:14:11 +0200 Subject: [PATCH 0246/1079] claude-code: fix voice mode native module load on Linux The bun-compiled binary embeds audio-capture.node (cpal + alsa-rs), which dlopens libasound.so.2 at runtime. Because the native module lives inside bun's virtual filesystem, autoPatchelfHook can't reach it during the build, so on Linux the load fails and /voice prints the "install SoX" fallback message. Expose alsa-lib via LD_LIBRARY_PATH so the native module loads. --- pkgs/by-name/cl/claude-code/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index ace41055c5f9..e7b6b4190de9 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -9,6 +9,7 @@ installShellFiles, makeBinaryWrapper, autoPatchelfHook, + alsa-lib, procps, ripgrep, bubblewrap, @@ -56,7 +57,9 @@ stdenv.mkDerivation (finalAttrs: { --set-default FORCE_AUTOUPDATE_PLUGINS 1 \ --set DISABLE_INSTALLATION_CHECKS 1 \ --set USE_BUILTIN_RIPGREP 0 \ - --prefix PATH : ${ + ${lib.optionalString stdenv.hostPlatform.isLinux '' + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ alsa-lib ]} \ + ''}--prefix PATH : ${ lib.makeBinPath ( [ # claude-code uses [node-tree-kill](https://github.com/pkrumins/node-tree-kill) which requires procps's pgrep(darwin) or ps(linux) From 953e9bf43e8543977c681925956ba6ec63a9da28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 May 2026 11:37:38 +0200 Subject: [PATCH 0247/1079] pingr: init at 0.3.0 Tool to ping multiple hosts https://github.com/cybrly/pingr --- pkgs/by-name/pi/pingr/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/pi/pingr/package.nix diff --git a/pkgs/by-name/pi/pingr/package.nix b/pkgs/by-name/pi/pingr/package.nix new file mode 100644 index 000000000000..4b836e35f84a --- /dev/null +++ b/pkgs/by-name/pi/pingr/package.nix @@ -0,0 +1,30 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "pingr"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "cybrly"; + repo = "pingr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q4Qu2Gf6hDNwY9B0dqRJPLtbuHMgwgyauzz13Vk9rOk="; + }; + + __structuredAttrs = true; + + cargoHash = "sha256-HlMo1RYPi9GyV1WEcCrWepJLDMfsLSMgokinDwIJXuc="; + + meta = { + description = "Tool to ping multiple hosts"; + homepage = "https://github.com/cybrly/pingr"; + changelog = "https://github.com/cybrly/pingr/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "pingr"; + }; +}) From 4d2f0a15b9ba28fa74b1917eac4ae252471d32c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 09:50:36 +0000 Subject: [PATCH 0248/1079] git-pkgs: 0.15.4 -> 0.16.0 --- pkgs/by-name/gi/git-pkgs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-pkgs/package.nix b/pkgs/by-name/gi/git-pkgs/package.nix index dbc10988424e..f304f36bfb41 100644 --- a/pkgs/by-name/gi/git-pkgs/package.nix +++ b/pkgs/by-name/gi/git-pkgs/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "git-pkgs"; - version = "0.15.4"; + version = "0.16.0"; src = fetchFromGitHub { owner = "git-pkgs"; repo = "git-pkgs"; tag = "v${version}"; - hash = "sha256-/egkYzrRtYy94fRDDEsFFTj+c0yorm8REaqedQSJyEw="; + hash = "sha256-5fo4Zvh5ho8WefDv3bV5sVi9j3RwHWP4+ShigqDOUl8="; }; - vendorHash = "sha256-eVa2tNLy2Oul1Uqq5Bf1arvjvH9ic24rc6NBDPu1gvk="; + vendorHash = "sha256-GPtw+iCUH5/V13WNSvmktchXOz0PGW5ckhCqpiRhHLQ="; subPackages = [ "." ]; From 712adf72588325f81451f293f90f948836d04b6f Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Mon, 11 May 2026 10:20:31 +0000 Subject: [PATCH 0249/1079] createrepo_c: 1.2.1 -> 1.2.3 --- pkgs/by-name/cr/createrepo_c/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cr/createrepo_c/package.nix b/pkgs/by-name/cr/createrepo_c/package.nix index 83f8e7d4486b..3a9c3b5309c5 100644 --- a/pkgs/by-name/cr/createrepo_c/package.nix +++ b/pkgs/by-name/cr/createrepo_c/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "createrepo_c"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = "createrepo_c"; tag = finalAttrs.version; - hash = "sha256-2mvU2F9rvG4FtDgq+M9VXWg+c+AsW/+tDPaEj7zVmQ0="; + hash = "sha256-0+TnRLrQM3/rfLTkj5zHlXRXq/4n4OvkZgIRC5+XGS4="; }; postPatch = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "EXECUTE_PROCESS(COMMAND \''${PYTHON_EXECUTABLE} -c \"from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))\" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)" "SET(PYTHON_INSTALL_DIR \"$out/${python3.sitePackages}\")" substituteInPlace CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)" + --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 3.7)" "cmake_minimum_required(VERSION 3.10)" ''; nativeBuildInputs = [ @@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config rpm bash-completion + python3.pkgs.setuptools ]; buildInputs = [ From d92bbb7099fa47b0086b3c8f35d48939fe2dd50d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 10:31:32 +0000 Subject: [PATCH 0250/1079] crossmacro: 1.0.1 -> 1.1.0 --- pkgs/by-name/cr/crossmacro/deps.json | 191 +++++++++++++++++-------- pkgs/by-name/cr/crossmacro/package.nix | 4 +- 2 files changed, 135 insertions(+), 60 deletions(-) diff --git a/pkgs/by-name/cr/crossmacro/deps.json b/pkgs/by-name/cr/crossmacro/deps.json index ccc7a8ca29c6..469d0449149f 100644 --- a/pkgs/by-name/cr/crossmacro/deps.json +++ b/pkgs/by-name/cr/crossmacro/deps.json @@ -1,103 +1,138 @@ [ + { + "pname": "Acornima", + "version": "1.4.0", + "hash": "sha256-7SCe3Bgcyzlv6nXQfTOy3UZLc7ilZ3YXxgl6mcTF82s=" + }, { "pname": "Avalonia", - "version": "11.3.13", - "hash": "sha256-9khLyFw6dk82UhmQoGf0R2HA5AmRyGA0pydM+unZ+ww=" + "version": "12.0.2", + "hash": "sha256-Ht2h4cBtnVhrk9VWsHDOEvU1wd/y80CxMDWn8W0lHKk=" }, { "pname": "Avalonia.BuildServices", "version": "11.3.2", "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40=" }, - { - "pname": "Avalonia.Controls.ColorPicker", - "version": "11.3.13", - "hash": "sha256-hzGLVkFxGDxqYE0+1J6Ze/akUUmhnGiNaeHeNx9JYlg=" - }, - { - "pname": "Avalonia.Diagnostics", - "version": "11.3.13", - "hash": "sha256-hGiZB8zq56ByjzSf1o3XEJ0rHTnVNrGrVm3xgwVwleg=" - }, { "pname": "Avalonia.Fonts.Inter", - "version": "11.3.13", - "hash": "sha256-cP7mpGsk+qAMzsfbrq42pujN8ZLsD+PSjXGDnMIjVp4=" + "version": "12.0.2", + "hash": "sha256-23iKfc71xCy+vaHlxSRi19ZsJ48Dey6mdOx9CGzg2SA=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.3.13", - "hash": "sha256-YLAdQj/8zmrKJp7+7EQY6bmDXfCiBtUHYrVw0KPpXNw=" + "version": "12.0.2", + "hash": "sha256-raEQGX8Vwr+c7W5SzkEZ/phEEs/a5N0xeUfAWKEpl6A=" + }, + { + "pname": "Avalonia.FreeDesktop.AtSpi", + "version": "12.0.2", + "hash": "sha256-5AQPlWW6g7G6pm7qI8RHR/MQ45VGd7iAFWseXUitIVI=" + }, + { + "pname": "Avalonia.HarfBuzz", + "version": "12.0.2", + "hash": "sha256-FUYKVfweWiFix+LJZt9scI7HYiIl3C+8j9K0/yKsOIE=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.3.13", - "hash": "sha256-HrT+dI3NLTVv5NpmhEb1ZVrXF4hgC0IkQ23VZVmw/qc=" + "version": "12.0.2", + "hash": "sha256-19hc0GSsa9JujiZlHxLKn7x6fUjAeJSH3lO43hL0bD0=" }, { "pname": "Avalonia.Skia", - "version": "11.3.13", - "hash": "sha256-kNIZ8HpNiQIqEyYYlJ/ND/tBGT5KY3jeL8W6GFTJIvU=" + "version": "12.0.0", + "hash": "sha256-w8i8lTkf3yp78rPxg7LlcsrKF/K3J7ATOTy3D/Bt6CA=" + }, + { + "pname": "Avalonia.Skia", + "version": "12.0.2", + "hash": "sha256-ZzNoO/8/SYG4xN0RmPz9AC6N1RtPTnSaTVrQ0+NNvGU=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.3.13", - "hash": "sha256-bAIaj72UKH5Lxv1bLcXt5bPuB51pYGOJHO1gGs1uGrM=" - }, - { - "pname": "Avalonia.Themes.Simple", - "version": "11.3.13", - "hash": "sha256-PzCYsrELqrINWcTzIHpnKQ757xsiYMEBa6fTUQGg3zE=" + "version": "12.0.2", + "hash": "sha256-H8AXau1gV8m33lKYrSzxp0GDmoCuyx7+B93gTfcpXXU=" }, { "pname": "Avalonia.X11", - "version": "11.3.13", - "hash": "sha256-Eeeq4K4q2GihIVFhCKFjTc+di/M39OgfFyF7aaZOJdg=" + "version": "12.0.2", + "hash": "sha256-not3Qv87nbN6Bi8sE49WKDSNzUTISBdcNR3rcFqgwHE=" }, { "pname": "CommunityToolkit.Mvvm", "version": "8.4.2", "hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU=" }, + { + "pname": "ExCSS", + "version": "4.3.1", + "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o=" + }, { "pname": "HarfBuzzSharp", - "version": "8.3.1.1", - "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0=" + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" + }, + { + "pname": "HarfBuzzSharp", + "version": "8.3.1.3", + "hash": "sha256-/+ZEhjpOs8B4tMPw3vDyuQqGGZHJEWvy3WaKMaDwmrU=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "8.3.1.1", - "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU=" + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Linux", + "version": "8.3.1.3", + "hash": "sha256-feWOna/8ncvmrq7CxnDczv1facV2poZV5R+OyCtocpU=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "8.3.1.1", - "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q=" + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.macOS", + "version": "8.3.1.3", + "hash": "sha256-6WKsJ/jF9pHnaWcQvaezc5AV6flu3XsOxQs7i4BGYJs=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "8.3.1.1", - "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw=" + "version": "8.3.1.3", + "hash": "sha256-arBiI82fXPjAqftqnG7Wc3BRzZ6+vKd7b58vQSWJVk0=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "8.3.1.1", - "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo=" + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + }, + { + "pname": "HarfBuzzSharp.NativeAssets.Win32", + "version": "8.3.1.3", + "hash": "sha256-WNUQmLWVFSwBKT9x7UdhSz9T2FA7wibvwjuPew/3yUM=" + }, + { + "pname": "Jint", + "version": "4.8.0", + "hash": "sha256-+K8NGiJ1SChiyMrjn4dJOiBdnWXP6UOfXSsNsJ5//tI=" }, { "pname": "MicroCom.Runtime", - "version": "0.11.0", - "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + "version": "0.11.4", + "hash": "sha256-hd13T4Z9DsF1Sb56bS+SDpWjksJVzb4m/Kp37jaUhkU=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "10.0.5", - "hash": "sha256-ofDRirUV9XLSz4oksCqErwBJFtAieHACFfyZukHKFng=" + "version": "10.0.7", + "hash": "sha256-dICogdaqa5mHqyvFA0lTomFa39Dqm4nn7Pit6qi6eQY=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "10.0.5", - "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g=" + "version": "10.0.7", + "hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk=" }, { "pname": "Serilog", @@ -134,39 +169,79 @@ "version": "7.0.0", "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo=" }, + { + "pname": "ShimSkiaSharp", + "version": "4.6.0", + "hash": "sha256-t2QHrLvtB9gONm2LA7GzGZIQXN5T0OrNDEdMqogWLic=" + }, { "pname": "SkiaSharp", "version": "2.88.9", "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" }, + { + "pname": "SkiaSharp", + "version": "3.119.4-preview.1.1", + "hash": "sha256-yUHsoau6WVQkzYV5UVnKcgpABiapa9aoTDd1pw/J5r8=" + }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.9", - "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + "version": "3.119.4-preview.1.1", + "hash": "sha256-jcf0FhUgOzxpJ4ENn1q5uPe8dT+kXl0/yUWJs+hDYNA=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.9", - "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + "version": "3.119.4-preview.1.1", + "hash": "sha256-olbqFOHmkiCdlnXHU4l1lTb04yAPn21CvLNMP4AGncs=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.9", - "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" + "version": "3.119.4-preview.1.1", + "hash": "sha256-R+67ADA6luDa9b7xvsE4PSL6GWwQTaNYzw2WYou/ofQ=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.9", - "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + "version": "3.119.4-preview.1.1", + "hash": "sha256-Sd+KnMezIKbc4OLklHsfeM7EVZERtmawWuSCoaySteM=" }, { - "pname": "Tmds.DBus", - "version": "0.91.1", - "hash": "sha256-MtHZFutIm0VKVkM/kRMucZIRL0jAEEPSj2D2MLxbAH4=" + "pname": "Svg.Animation", + "version": "4.6.0", + "hash": "sha256-KwXuouxbsgb98pyrYEL9HGWVkAXUzmfOsWYttCJQ1fk=" + }, + { + "pname": "Svg.Controls.Skia.Avalonia", + "version": "12.0.0.6", + "hash": "sha256-W0SLHlfzXIAO1YrbxwXcXBwV1CH18inaUv5l2qL/D68=" + }, + { + "pname": "Svg.Custom", + "version": "4.6.0", + "hash": "sha256-Vp2VtpY1GMKh9FVTbgX5l6OtX/KKO+T+uj6KczNVLZk=" + }, + { + "pname": "Svg.JavaScript", + "version": "4.6.0", + "hash": "sha256-u9Bf3OU+cB5VnQr/CL7wBQw3YBxfh4OIXehXumDCYnI=" + }, + { + "pname": "Svg.Model", + "version": "4.6.0", + "hash": "sha256-2b2g4TyQEYIEoubJHrB8Fpu2ZWb7eHN4vM/PZqJ1tbw=" + }, + { + "pname": "Svg.SceneGraph", + "version": "4.6.0", + "hash": "sha256-8O89YBURkaJS08paV/LqLP4Z8oTdMJPrgkm8HAjWCcs=" + }, + { + "pname": "Svg.Skia", + "version": "4.6.0", + "hash": "sha256-kOUnFu2asUQqd3TfxN25WKbxR2TbcXOPTDCaR7LScP0=" }, { "pname": "Tmds.DBus.Protocol", - "version": "0.21.2", - "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" + "version": "0.92.0", + "hash": "sha256-WZSB9eqSOIzsBfnpOJDIIopIhNxAH+UcZuD6W94PIN4=" } ] diff --git a/pkgs/by-name/cr/crossmacro/package.nix b/pkgs/by-name/cr/crossmacro/package.nix index 07856440a205..7ce53fca1090 100644 --- a/pkgs/by-name/cr/crossmacro/package.nix +++ b/pkgs/by-name/cr/crossmacro/package.nix @@ -29,13 +29,13 @@ buildDotnetModule rec { pname = "crossmacro"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "alper-han"; repo = "CrossMacro"; tag = "v${version}"; - hash = "sha256-ki5zEFqa9wSGw2jidGoN0Zb69to7ilXgb9fqrjo40ks="; + hash = "sha256-M+Mat8pYeUyzomuvDdHdTHbyquTBDqrHHObVixTM3is="; }; projectFile = "src/CrossMacro.UI.Linux/CrossMacro.UI.Linux.csproj"; From 51a8cf75096a9f0e114037b305b7b8c179083ed7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 10:33:41 +0000 Subject: [PATCH 0251/1079] crossmacro-daemon: 1.0.1 -> 1.1.0 --- pkgs/by-name/cr/crossmacro-daemon/deps.json | 9 ++------- pkgs/by-name/cr/crossmacro-daemon/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cr/crossmacro-daemon/deps.json b/pkgs/by-name/cr/crossmacro-daemon/deps.json index e712b6c324cf..e7c1dcd91d03 100644 --- a/pkgs/by-name/cr/crossmacro-daemon/deps.json +++ b/pkgs/by-name/cr/crossmacro-daemon/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "10.0.5", - "hash": "sha256-KrP+hE3gk7pATbJYZsJ1LHiXjzLA+ntHW7G/VGgHk2g=" + "version": "10.0.7", + "hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk=" }, { "pname": "Serilog", @@ -38,10 +38,5 @@ "pname": "Serilog.Sinks.File", "version": "7.0.0", "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo=" - }, - { - "pname": "Tmds.DBus", - "version": "0.91.1", - "hash": "sha256-MtHZFutIm0VKVkM/kRMucZIRL0jAEEPSj2D2MLxbAH4=" } ] diff --git a/pkgs/by-name/cr/crossmacro-daemon/package.nix b/pkgs/by-name/cr/crossmacro-daemon/package.nix index b28b53b918ff..f9b31c295935 100644 --- a/pkgs/by-name/cr/crossmacro-daemon/package.nix +++ b/pkgs/by-name/cr/crossmacro-daemon/package.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "crossmacro-daemon"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "alper-han"; repo = "CrossMacro"; tag = "v${version}"; - hash = "sha256-ki5zEFqa9wSGw2jidGoN0Zb69to7ilXgb9fqrjo40ks="; + hash = "sha256-M+Mat8pYeUyzomuvDdHdTHbyquTBDqrHHObVixTM3is="; }; projectFile = "src/CrossMacro.Daemon/CrossMacro.Daemon.csproj"; From 301401a93d657e877011869eb1fa5f1ecbb803e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 10:46:36 +0000 Subject: [PATCH 0252/1079] sentry-native: 0.13.7 -> 0.14.0 --- pkgs/by-name/se/sentry-native/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix index 750b2a2237b9..596c497f0623 100644 --- a/pkgs/by-name/se/sentry-native/package.nix +++ b/pkgs/by-name/se/sentry-native/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sentry-native"; - version = "0.13.7"; + version = "0.14.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; tag = finalAttrs.version; - hash = "sha256-TrczlrPn9b0i5uJmt0bd0XOuH+R8WXIV2WQxLRnFYgA="; + hash = "sha256-TIKYmHSoKd3aJ3lXigcUsFLcps51Y0h7coBCa+drE1U="; }; nativeBuildInputs = [ From bf9a705ae2c74e67a0a9cbd2963821e3b822ced5 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 11 May 2026 13:06:21 +0200 Subject: [PATCH 0253/1079] spire-tpm-plugin: 1.11.1 -> 1.11.3 --- pkgs/by-name/sp/spire-tpm-plugin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spire-tpm-plugin/package.nix b/pkgs/by-name/sp/spire-tpm-plugin/package.nix index 299bae4d1d00..90a95f0e5ba7 100644 --- a/pkgs/by-name/sp/spire-tpm-plugin/package.nix +++ b/pkgs/by-name/sp/spire-tpm-plugin/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "spire-tpm-plugin"; - version = "1.11.1"; + version = "1.11.3"; src = fetchFromGitHub { owner = "spiffe"; repo = "spire-tpm-plugin"; tag = "v${finalAttrs.version}"; - hash = "sha256-6hy1aQg0tS2wxOZRbZLv82HQEufVmW/a5L6Da+bNeHU="; + hash = "sha256-QHFLFotfMyUxKQHN1CcmNMvLvMEatltZPHiUA3G5QWo="; }; proxyVendor = true; From 7e152853fb14470e6df38f8d8d94990aa5ba60c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 12:37:00 +0000 Subject: [PATCH 0254/1079] k6: 1.7.1 -> 2.0.0 --- pkgs/by-name/k6/k6/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/k6/k6/package.nix b/pkgs/by-name/k6/k6/package.nix index 7edd07e1606b..a9b1883a35cd 100644 --- a/pkgs/by-name/k6/k6/package.nix +++ b/pkgs/by-name/k6/k6/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "k6"; - version = "1.7.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "grafana"; repo = "k6"; rev = "v${finalAttrs.version}"; - hash = "sha256-vULff8EVWns2N7QRK/dt90Jq10W3UFGXcIe3IXqJ+yA="; + hash = "sha256-dtP2G0rk8f3TEPTf5fu/1BEH4nLzboTyE/vveVhlcqo="; }; subPackages = [ "./" ]; From 2ec0411122613318630a4e0a796cde11be5c264d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 12:38:46 +0000 Subject: [PATCH 0255/1079] peazip: 11.0.0 -> 11.1.0 --- pkgs/by-name/pe/peazip/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix index 764670abb4dd..7a94d230456f 100644 --- a/pkgs/by-name/pe/peazip/package.nix +++ b/pkgs/by-name/pe/peazip/package.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "peazip"; - version = "11.0.0"; + version = "11.1.0"; src = fetchFromGitHub { owner = "peazip"; repo = "peazip"; rev = finalAttrs.version; - hash = "sha256-jeAvnSNLS173/diuGfv/PEvj7M4ARRHLoXQ2bkKSMP8="; + hash = "sha256-PuY+68+7XxsWylS6skhNF40o+Qt26RwmVxVTLmGXIn0="; }; sourceRoot = "${finalAttrs.src.name}/peazip-sources"; From 15e89db54b58eb20b980990aabd1ad315b42fb20 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Mon, 11 May 2026 13:23:21 +0200 Subject: [PATCH 0256/1079] nixos/tests/spire: add tpm selectors support to test --- nixos/tests/spire.nix | 148 ++++++++++++++++++++++-------------------- 1 file changed, 78 insertions(+), 70 deletions(-) diff --git a/nixos/tests/spire.nix b/nixos/tests/spire.nix index dec1d0748df1..f7f915c18fd5 100644 --- a/nixos/tests/spire.nix +++ b/nixos/tests/spire.nix @@ -54,6 +54,66 @@ let }; users.groups.workload = { }; }; + + tpmAgent = + { pkgs, lib, ... }: + { + imports = [ agent ]; + virtualisation = { + useEFIBoot = true; + tpm = { + enable = true; + # Provision the swtpm with an EK certificate signed by testCA so that + # the SPIRE server can verify the agent's identity. + provisioning = '' + export PATH=${ + lib.makeBinPath [ + pkgs.openssl + pkgs.tpm2-tools + ] + }:$PATH + + tpm2_createek -G rsa -u ek.pub -c ek.ctx -f pem + + openssl x509 \ + -extfile ${ekSignConf} \ + -new -days 365 \ + -subj "/CN=swtpm-ekcert" \ + -extensions tpm_policy \ + -CA ${./tpm-ek/ca.crt} -CAkey ${./tpm-ek/ca.priv} \ + -out ekcert.der -outform der \ + -force_pubkey ek.pub + + tpm2_nvdefine 0x01c00002 \ + -C o \ + -a "ownerread|policyread|policywrite|ownerwrite|authread|authwrite" \ + -s "$(wc -c < ekcert.der)" + + tpm2_nvwrite 0x01c00002 -C o -i ekcert.der + ''; + }; + }; + + environment.systemPackages = [ pkgs.spire-tpm-plugin ]; + + services.spire.agent = { + enable = true; + settings = { + agent = { + trust_domain = trustDomain; + server_address = "server.${trustDomain}"; + trust_bundle_format = "pem"; + trust_bundle_path = "$CREDENTIALS_DIRECTORY/spire.trust_bundle"; + }; + plugins = { + KeyManager.memory.plugin_data = { }; + NodeAttestor.tpm.plugin_data = { }; + WorkloadAttestor.systemd.plugin_data = { }; + WorkloadAttestor.unix.plugin_data = { }; + }; + }; + }; + }; in { name = "spire"; @@ -108,65 +168,8 @@ in }; }; - tpmAgent = - { pkgs, lib, ... }: - { - imports = [ agent ]; - virtualisation = { - useEFIBoot = true; - tpm = { - enable = true; - # Provision the swtpm with an EK certificate signed by testCA so that - # the SPIRE server can verify the agent's identity. - provisioning = '' - export PATH=${ - lib.makeBinPath [ - pkgs.openssl - pkgs.tpm2-tools - ] - }:$PATH - - tpm2_createek -G rsa -u ek.pub -c ek.ctx -f pem - - openssl x509 \ - -extfile ${ekSignConf} \ - -new -days 365 \ - -subj "/CN=swtpm-ekcert" \ - -extensions tpm_policy \ - -CA ${./tpm-ek/ca.crt} -CAkey ${./tpm-ek/ca.priv} \ - -out ekcert.der -outform der \ - -force_pubkey ek.pub - - tpm2_nvdefine 0x01c00002 \ - -C o \ - -a "ownerread|policyread|policywrite|ownerwrite|authread|authwrite" \ - -s "$(wc -c < ekcert.der)" - - tpm2_nvwrite 0x01c00002 -C o -i ekcert.der - ''; - }; - }; - - environment.systemPackages = [ pkgs.spire-tpm-plugin ]; - - services.spire.agent = { - enable = true; - settings = { - agent = { - trust_domain = trustDomain; - server_address = "server.${trustDomain}"; - trust_bundle_format = "pem"; - trust_bundle_path = "$CREDENTIALS_DIRECTORY/spire.trust_bundle"; - }; - plugins = { - KeyManager.memory.plugin_data = { }; - NodeAttestor.tpm.plugin_data = { }; - WorkloadAttestor.systemd.plugin_data = { }; - WorkloadAttestor.unix.plugin_data = { }; - }; - }; - }; - }; + tpmAgent = tpmAgent; + tpmSelectorAgent = tpmAgent; }; testScript = @@ -175,8 +178,6 @@ in adminSocket = nodes.server.services.spire.server.settings.server.socket_path; in '' - spiffe_id = "spiffe://${trustDomain}/service/backdoor" - def provision_trust_bundle(agent): # TODO: instead of trust bundle to talk to the spire-server, use an upstream CA? bundle = server.succeed("spire-server bundle show -socketPath ${adminSocket}") @@ -197,28 +198,34 @@ in return f"spiffe://${trustDomain}/spire/agent/tpm/{ek_hash}" + def provision_tpm_selector(agent): + agent.wait_for_unit("tpm2.target") + alias_id = "spiffe://${trustDomain}/aliased-agent/tpm-model" + register_entry("spiffe://${trustDomain}/spire/server", "tpm:model:ST33HTPHAHD4", alias_id) + return alias_id + + def register_entry(parent_id, selector, spiffe_id): server.succeed(f"spire-server entry create -socketPath ${adminSocket} -selector '{selector}' -parentID '{parent_id}' -spiffeID '{spiffe_id}'") def test_agent(name, agent_node, provision_fn): + workload_spiffe_id = f"spiffe://${trustDomain}/{name}/workload" with subtest(f"Setup SPIRE agent with {name} attestation"): provision_trust_bundle(agent_node) parent_id = provision_fn(agent_node) - register_entry(parent_id, "systemd:id:backdoor.service", spiffe_id) - register_entry(parent_id, "unix:user:workload", "spiffe://${trustDomain}/workload") + register_entry(parent_id, "unix:user:workload", workload_spiffe_id) agent_node.wait_for_unit("spire-agent.service") agent_node.wait_until_succeeds("spire-agent healthcheck -socketPath $SPIFFE_ENDPOINT_SOCKET", timeout=90) - with subtest(f"Test certificate authentication from {name} agent"): - agent_node.wait_until_succeeds("spire-agent api fetch x509 -socketPath $SPIFFE_ENDPOINT_SOCKET -write .") - with subtest(f"Workload running as non-root, non-spire-agent user can reach Workload API ({name})"): - # SPIRE's security model relies on workload attestation, not unix - # permissions on the socket. Verify an unrelated user can connect. - agent_node.wait_until_succeeds( + with subtest(f"Workload user receives the {name} workload SVID"): + # Each agent node is fresh, so fetch returns "no identity issued" + # (non-zero) until exactly this entry's SVID is cached — content-aware + # retry isn't needed. + output = agent_node.wait_until_succeeds( "su -s /bin/sh workload -c " "'spire-agent api fetch x509 -socketPath \"$SPIFFE_ENDPOINT_SOCKET\"'" ) - # TODO: Add something to communicate with + t.assertIn(workload_spiffe_id, output) with subtest("SPIRE server startup and health checks"): @@ -228,6 +235,7 @@ in test_agent("join_token", agent, provision_join_token) test_agent("tpm", tpmAgent, provision_tpm) + test_agent("tpm-selector", tpmSelectorAgent, provision_tpm_selector) ''; } From f124d8254fed06b9c2e4cbc962fd478ef2a1c60d Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 11 May 2026 21:09:28 +0800 Subject: [PATCH 0257/1079] ayugram-desktop: fix build on darwin --- pkgs/by-name/ay/ayugram-desktop/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix index 509577e12c94..75c9951003aa 100644 --- a/pkgs/by-name/ay/ayugram-desktop/package.nix +++ b/pkgs/by-name/ay/ayugram-desktop/package.nix @@ -1,7 +1,9 @@ { lib, fetchFromGitHub, + fetchpatch2, nix-update-script, + stdenvNoCC, telegram-desktop, withWebkit ? true, }: @@ -22,6 +24,13 @@ telegram-desktop.override { fetchSubmodules = true; }; + patches = + (previousAttrs.patches or [ ]) + ++ (lib.optional stdenvNoCC.hostPlatform.isDarwin (fetchpatch2 { + url = "https://github.com/telegramdesktop/tdesktop/commit/923efd9e7ef8ff72d9b83973502e587682119e54.patch?full_index=1"; + hash = "sha256-XcmH9SSI3K2SsFjHDEMnKA6YOyWF1kRVJJAWP2/vdf8="; + })); + passthru.updateScript = nix-update-script { }; meta = previousAttrs.meta // { From 8dd105c44b18aa25594d5488b163267ccf84e736 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 13:57:28 +0000 Subject: [PATCH 0258/1079] telemt: 3.4.5 -> 3.4.11 --- pkgs/by-name/te/telemt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telemt/package.nix b/pkgs/by-name/te/telemt/package.nix index aa34b47931bc..df7f5210a381 100644 --- a/pkgs/by-name/te/telemt/package.nix +++ b/pkgs/by-name/te/telemt/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "telemt"; - version = "3.4.5"; + version = "3.4.11"; src = fetchFromGitHub { owner = "telemt"; repo = "telemt"; tag = version; - hash = "sha256-zOdVnW7RTPAbR6fpzDqPpwhOWjxknmg8TzGXmBCbWjg="; + hash = "sha256-jBspeSj8aRbHngK8bviVt/i1UiYUPRHSd8+7dnmJOQY="; }; - cargoHash = "sha256-/7Xd/6NEu6QqFdVUz4M+iz9+7K5lEDguyaprAKh86wo="; + cargoHash = "sha256-x5/SLSlYeGx40oXj/I/5zvyTNgSBwKsA33OwVIq9LGw="; meta = { mainProgram = "telemt"; From fba4f879eb658676a2c0943b1bde77db4225f10f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 14:04:33 +0000 Subject: [PATCH 0259/1079] tree-sitter-grammars.tree-sitter-regex: 0.25.0 -> 1.0.0 --- pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix index 42f674918f5c..b85eca87ddaf 100644 --- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix @@ -2237,9 +2237,9 @@ }; regex = { - version = "0.25.0"; + version = "1.0.0"; url = "github:tree-sitter/tree-sitter-regex"; - hash = "sha256-bR0K6SR19QuQwDUic+CJ69VQTSGqry5a5IOpPTVJFlo="; + hash = "sha256-3D+LOWRUamAdbegVfWD5yFcCjBucthPogOL/zWR78PY="; meta = { license = lib.licenses.mit; }; From c61df78b0788d6a45e2126403cc4cbf1c3425214 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 11 May 2026 21:16:12 +0700 Subject: [PATCH 0260/1079] python3Packages.ics: disable test_gehol --- pkgs/development/python-modules/ics/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ics/default.nix b/pkgs/development/python-modules/ics/default.nix index beb0b7b40b35..4822b92fb575 100644 --- a/pkgs/development/python-modules/ics/default.nix +++ b/pkgs/development/python-modules/ics/default.nix @@ -47,6 +47,8 @@ buildPythonPackage rec { "test_many_lines" # AssertionError: 'Europe/Berlin' not found in "tzfile('Atlantic/Jan_Mayen')" "test_timezone_not_dropped" + # tatsu PEG parser hits recursion limit on the bundled gehol/BA1.ics fixture + "test_gehol" ]; pythonImportsCheck = [ "ics" ]; From 4cbc234b10b56772b9fbc1b3d5335d01ef4d6011 Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 11 May 2026 21:19:40 +0700 Subject: [PATCH 0261/1079] python3Packages.highdicom: backport series_time validation fix --- pkgs/development/python-modules/highdicom/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index bc0d93d35fd1..08422adc1f49 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pytestCheckHook, numpy, pillow, @@ -26,6 +27,14 @@ buildPythonPackage rec { hash = "sha256-Tfy7u5MVapRE24CZLFzTnYChnH9JJ9V7FuUhDoktBFc="; }; + patches = [ + # Fix time-of-day-dependent failure in series_time validation. + (fetchpatch2 { + url = "https://github.com/ImagingDataCommons/highdicom/commit/e9e3f2514a74b0d4be736cff222c934ef66d67ff.patch"; + hash = "sha256-48dJAimxXYG0FQouquY5TLXi+3HarS8yx9HoLXiFymM="; + }) + ]; + build-system = [ setuptools ]; From f5f52c5832cdb80e38e646f97d3258f8135e2326 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 May 2026 16:37:41 +0200 Subject: [PATCH 0262/1079] python3Packages.renault-api: 0.5.7 -> 0.5.8 Diff: https://github.com/hacf-fr/renault-api/compare/v0.5.7...v0.5.8 Changelog: https://github.com/hacf-fr/renault-api/releases/tag/v0.5.8 --- pkgs/development/python-modules/renault-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index 611a613005fc..978dfc6425dd 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "renault-api"; - version = "0.5.7"; + version = "0.5.8"; pyproject = true; src = fetchFromGitHub { owner = "hacf-fr"; repo = "renault-api"; tag = "v${finalAttrs.version}"; - hash = "sha256-12xeTaGwKRELbMVmzjhlPm0xnkmVTHUJC2zE0Xkne9s="; + hash = "sha256-/ZvMrEe3qgtMpg49OLZH1YTXQKSGR8e3yaShghnyMv4="; }; build-system = [ poetry-core ]; From f472a6385bfaf1a479dd9108d74b631e9bd5272e Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 9 May 2026 14:43:47 +0300 Subject: [PATCH 0263/1079] fetchPnpmDeps: deprecate fetcherVersion = 2 Extend the existing v1 deprecation warning to also fire for `fetcherVersion = 2`, since callers should migrate directly to `fetcherVersion = 3`. Both pre-v3 versions now share a single `lib.warnIf` keyed on `fetcherVersion < 3` and produce a message parameterised by the offending version. Consolidate the manual's version-history entries: the per-item **Deprecated** and **Recommended** labels are replaced by a single sentence above the list noting that v3 is recommended and v1/v2 are scheduled for removal. Add a release note mirroring the existing v1 entry. --- doc/languages-frameworks/javascript.section.md | 6 ++++-- doc/release-notes/rl-2605.section.md | 11 ++++++----- pkgs/build-support/node/fetch-pnpm-deps/default.nix | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 362130e5ba5f..24581774482b 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -503,9 +503,11 @@ Changes can include workarounds or bug fixes to existing PNPM issues. ##### Version history {#javascript-pnpm-fetcherVersion-versionHistory} -- 1: Initial version, nothing special. **Deprecated: Scheduled for removal in the 26.11 release.**. New packages must not use this value. +Version 3 is the recommended value for new packages. Versions 1 and 2 are deprecated and scheduled for removal in the 26.11 release; existing packages must migrate. + +- 1: Initial version, nothing special. - 2: [Ensure consistent permissions](https://github.com/NixOS/nixpkgs/pull/422975) -- 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950). **Recommended** +- 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950) ### Yarn {#javascript-yarn} diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 5953d676210c..3fc280aaf548 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -330,11 +330,12 @@ - `fetchPnpmDeps` and `pnpmConfigHook` were added as top-level attributes, replacing the now deprecated `pnpm.fetchDeps` and `pnpm.configHook` attributes. -- `fetchPnpmDeps`' `fetcherVersion = 1` is deprecated and scheduled for removal - in the 26.11 release. A deprecation warning has been added. Packages still on - `fetcherVersion = 1` should migrate to `fetcherVersion = 3` and regenerate - their hashes. See the [pnpm `fetcherVersion` - section](#javascript-pnpm-fetcherVersion) of the manual for details. +- `fetchPnpmDeps`' `fetcherVersion = 1` and `fetcherVersion = 2` are deprecated + and scheduled for removal in the 26.11 release. A deprecation warning has + been added. Packages still on `fetcherVersion = 1` or `fetcherVersion = 2` + should migrate to `fetcherVersion = 3` and regenerate their hashes. See the + [pnpm `fetcherVersion` section](#javascript-pnpm-fetcherVersion) of the + manual for details. - `buildNpmPackage` now supports `npmDepsFetcherVersion` (and `fetchNpmDeps` now supports `fetcherVersion`). Set to `2` to enable packument caching, which fixes builds for projects using npm workspaces. diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index 6b33c263b895..8547e222db5b 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -61,8 +61,8 @@ in "fetchPnpmDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion." ) true; - lib.warnIf (fetcherVersion == 1) - "fetchPnpmDeps: `fetcherVersion = 1` is deprecated and scheduled for removal in the 26.11 release. Please migrate `${pname}` to `fetcherVersion = 3` and regenerate the hash. See https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion." + lib.warnIf (fetcherVersion < 3) + "fetchPnpmDeps: `fetcherVersion = ${toString fetcherVersion}` is deprecated and scheduled for removal in the 26.11 release. Please migrate `${pname}` to `fetcherVersion = 3` and regenerate the hash. See https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion." stdenvNoCC.mkDerivation ( From 61fa68485aa4668770cf7c702865a46ed573404b Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Mon, 11 May 2026 17:05:30 +0200 Subject: [PATCH 0264/1079] victoriametrics: 1.142.0 -> 1.143.0 Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.143.0 Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.142.0...v1.143.0 --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index ed8eb68050e2..0e65b7c55092 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule (finalAttrs: { pname = "VictoriaMetrics"; - version = "1.142.0"; + version = "1.143.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; tag = "v${finalAttrs.version}"; - hash = "sha256-PI4P0CGMcYbkrT8Rrgl5P56yTC+r3tnZudvFySzNJeY="; + hash = "sha256-K5NsQQ+r1XoOCfeYzZP3+2wdDpGNqWZLpe1hGqx11jA="; }; vendorHash = null; From f8ffa5592c727fe03bbc8eb4a24e18b0a95dcb8d Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 11 May 2026 21:03:29 +0700 Subject: [PATCH 0265/1079] python3Packages.iocx: skip flaky scaling perf test --- pkgs/development/python-modules/iocx/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/iocx/default.nix b/pkgs/development/python-modules/iocx/default.nix index 28e35fe1c63b..fdc39b388253 100644 --- a/pkgs/development/python-modules/iocx/default.nix +++ b/pkgs/development/python-modules/iocx/default.nix @@ -40,6 +40,10 @@ buildPythonPackage (finalAttrs: { disabledTests = [ # Test requires go to be available "test_cli_with_real_go_binary" + # flaky: timing-sensitive scaling assertion + "test_filepaths_scaling_behavior" + "test_crypto_scaling_behavior" + "test_scaling_behavior" ]; meta = { From c18d40d4e59ff85fce53371e3fb697c0616e2551 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 9 Sep 2025 16:22:51 +0100 Subject: [PATCH 0266/1079] gcc: drop obsolete Musl Go patches These are present in GCC 13, GCC 12 was removed, and `pkgsMusl.gccgo` fails to evaluate right now anyway. --- .../compilers/gcc/patches/default.nix | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 2e412802742e..471e43bb3b8e 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -108,64 +108,6 @@ optionals noSysDirs ( ## 2. Patches relevant on specific platforms #################################### -### Musl+Go+gcc12 - -# backport fixes to build gccgo with musl libc -++ optionals (stdenv.hostPlatform.isMusl && langGo) [ - # libgo: handle stat st_atim32 field and SYS_SECCOMP - # syscall: gofmt - # Add blank lines after //sys comments where needed, and then run gofmt - # on the syscall package with the new formatter. - # See https://go-review.googlesource.com/c/gofrontend/+/412074 - (fetchpatch { - excludes = [ "gcc/go/gofrontend/MERGE" ]; - url = "https://github.com/gcc-mirror/gcc/commit/cf79b1117bd177d3d4c6ed24b6fa243c3628ac2d.diff"; - hash = "sha256-mS5ZiYi5D8CpGXrWg3tXlbhp4o86ew1imCTwaHLfl+I="; - }) - # libgo: permit loff_t and off_t to be macros - # See https://go-review.googlesource.com/c/gofrontend/+/412075 - (fetchpatch { - excludes = [ "gcc/go/gofrontend/MERGE" ]; - url = "https://github.com/gcc-mirror/gcc/commit/7f195a2270910a6ed08bd76e3a16b0a6503f9faf.diff"; - hash = "sha256-Ze/cFM0dQofKH00PWPDoklXUlwWhwA1nyTuiDAZ6FKo="; - }) - # libgo: handle stat st_atim32 field and SYS_SECCOMP - # See https://go-review.googlesource.com/c/gofrontend/+/415294 - (fetchpatch { - excludes = [ "gcc/go/gofrontend/MERGE" ]; - url = "https://github.com/gcc-mirror/gcc/commit/762fd5e5547e464e25b4bee435db6df4eda0de90.diff"; - hash = "sha256-o28upwTcHAnHG2Iq0OewzwSBEhHs+XpBGdIfZdT81pk="; - }) - # runtime: portable access to sigev_notify_thread_id - # See https://sourceware.org/bugzilla/show_bug.cgi?id=27417 - # See https://go-review.googlesource.com/c/gofrontend/+/434755 - (fetchpatch { - excludes = [ "gcc/go/gofrontend/MERGE" ]; - url = "https://github.com/gcc-mirror/gcc/commit/e73d9fcafbd07bc3714fbaf8a82db71d50015c92.diff"; - hash = "sha256-1SjYCVHLEUihdON2TOC3Z2ufM+jf2vH0LvYtZL+c1Fo="; - }) - # syscall, runtime: always call XSI strerror_r - # See https://go-review.googlesource.com/c/gofrontend/+/454176 - (fetchpatch { - excludes = [ "gcc/go/gofrontend/MERGE" ]; - url = "https://github.com/gcc-mirror/gcc/commit/b6c6a3d64f2e4e9347733290aca3c75898c44b2e.diff"; - hash = "sha256-RycJ3YCHd3MXtYFjxP0zY2Wuw7/C4bWoBAQtTKJZPOQ="; - }) - # libgo: check for makecontext in -lucontext - # See https://go-review.googlesource.com/c/gofrontend/+/458396 - (fetchpatch { - excludes = [ "gcc/go/gofrontend/MERGE" ]; - url = "https://github.com/gcc-mirror/gcc/commit/2b1a604a9b28fbf4f382060bebd04adb83acc2f9.diff"; - hash = "sha256-WiBQG0Xbk75rHk+AMDvsbrm+dc7lDH0EONJXSdEeMGE="; - }) - # x86: Fix -fsplit-stack feature detection via TARGET_CAN_SPLIT_STACK - # Fixes compiling for non-glibc target - (fetchpatch { - url = "https://github.com/gcc-mirror/gcc/commit/c86b726c048eddc1be320c0bf64a897658bee13d.diff"; - hash = "sha256-QSIlqDB6JRQhbj/c3ejlmbfWz9l9FurdSWxpwDebnlI="; - }) -] - ## Darwin # Fixes detection of Darwin on x86_64-darwin and aarch64-darwin. Otherwise, GCC uses a deployment target of 10.5, which crashes ld64. From 307f1be6225093eb8f6afb2e322cd3e410f6641c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 May 2026 12:20:29 +0200 Subject: [PATCH 0267/1079] burstui: init at 3.1.0-unstable-2026-05-11 TUI for Gobuster https://github.com/trifoliolate-antihypertensivedrug145/burstui --- pkgs/by-name/bu/burstui/package.nix | 45 +++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/bu/burstui/package.nix diff --git a/pkgs/by-name/bu/burstui/package.nix b/pkgs/by-name/bu/burstui/package.nix new file mode 100644 index 000000000000..024ae9590ef7 --- /dev/null +++ b/pkgs/by-name/bu/burstui/package.nix @@ -0,0 +1,45 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + makeWrapper, + pkgs, +}: + +buildGoModule (finalAttrs: { + pname = "burstui"; + version = "3.1.0-unstable-2026-05-11"; + + src = fetchFromGitHub { + owner = "trifoliolate-antihypertensivedrug145"; + repo = "burstui"; + rev = "fa9a6e0c3d50736c56cb8ac785ae0320cfcacdd8"; + hash = "sha256-mSWEngpnV1zycqxsW7DW1gVPBQM8EUf/dip/sqV63ps="; + }; + + __structuredAttrs = true; + + vendorHash = "sha256-35IockAC27Va3+y2QwbyHeyKezgAG2F7mqTdNpo51lA="; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ + "-s" + "-X=main.version=${finalAttrs.version}" + "-X=main.commit=${finalAttrs.src.rev}" + "-X=main.commitDate=1970-01-01T00:00:00Z" + ]; + + postFixup = '' + wrapProgram $out/bin/burstui \ + --prefix PATH : ${lib.makeBinPath [ pkgs.gobuster ]} \ + ''; + + meta = { + description = "TUI for Gobuster"; + homepage = "https://github.com/trifoliolate-antihypertensivedrug145/burstui"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "burstui"; + }; +}) From 6feb747491b1680ab5137b9f87511eb6d3eb8736 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 10 May 2026 13:07:29 -0700 Subject: [PATCH 0268/1079] python3Packages.ha-garmin: init at 0.1.19 --- .../python-modules/ha-garmin/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/ha-garmin/default.nix diff --git a/pkgs/development/python-modules/ha-garmin/default.nix b/pkgs/development/python-modules/ha-garmin/default.nix new file mode 100644 index 000000000000..a445591e5dc3 --- /dev/null +++ b/pkgs/development/python-modules/ha-garmin/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + curl-cffi, + pydantic, + pytest-asyncio, + pytestCheckHook, + requests, +}: + +buildPythonPackage (finalAttrs: { + pname = "ha-garmin"; + version = "0.1.19"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cyberjunky"; + repo = "ha-garmin"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vzr32vuAVafdx64Fmv257gS2a+ZbfwZNwwuF5NPQbS0="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + curl-cffi + pydantic + requests + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # Upstream test relies on a field not present in the test fixture + "test_fetch_core_data_sleep_fields" + ]; + + pythonImportsCheck = [ "ha_garmin" ]; + + meta = { + description = "Python client for Garmin Connect API, designed for Home Assistant integration"; + homepage = "https://github.com/cyberjunky/ha-garmin"; + changelog = "https://github.com/cyberjunky/ha-garmin/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.jamiemagee ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcd84157257b..e1cd81997033 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6897,6 +6897,8 @@ self: super: with self; { ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + ha-garmin = callPackage ../development/python-modules/ha-garmin { }; + ha-iotawattpy = callPackage ../development/python-modules/ha-iotawattpy { }; ha-mqtt-discoverable = callPackage ../development/python-modules/ha-mqtt-discoverable { }; From 1277cf4572b957e796376c62f3c77d5c2dffa423 Mon Sep 17 00:00:00 2001 From: Jamie Magee Date: Sun, 10 May 2026 13:07:34 -0700 Subject: [PATCH 0269/1079] home-assistant-custom-components.garmin_connect: 0.2.38 -> 3.0.5 --- .../custom-components/garmin_connect/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix index cb06ea0f4ff4..76aede544d9f 100644 --- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix +++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix @@ -2,25 +2,23 @@ lib, buildHomeAssistantComponent, fetchFromGitHub, - garminconnect, - tzlocal, + ha-garmin, }: buildHomeAssistantComponent rec { owner = "cyberjunky"; domain = "garmin_connect"; - version = "0.2.38"; + version = "3.0.5"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "home-assistant-garmin_connect"; tag = version; - hash = "sha256-Df/ecgePR10LIeaGy0kmIWqiP9G7j+KscL/YA3VsARE="; + hash = "sha256-omHgfkrje5xR9gLnQpAz33+LtXm5eGJ8nERYBX4F2sY="; }; dependencies = [ - garminconnect - tzlocal + ha-garmin ]; meta = { From 61dfae2bfb3594974e43fb7149d3c17d67648497 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 May 2026 12:05:17 +0200 Subject: [PATCH 0270/1079] runoff: init at 3.1.0-unstable-2026-05-01 Active Directory security audit tool https://github.com/Real-Fruit-Snacks/Runoff --- pkgs/by-name/ru/runoff/package.nix | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 pkgs/by-name/ru/runoff/package.nix diff --git a/pkgs/by-name/ru/runoff/package.nix b/pkgs/by-name/ru/runoff/package.nix new file mode 100644 index 000000000000..0efd1740398a --- /dev/null +++ b/pkgs/by-name/ru/runoff/package.nix @@ -0,0 +1,54 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "runoff"; + version = "3.1.0-unstable-2026-05-01"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Real-Fruit-Snacks"; + repo = "Runoff"; + rev = "fa566364f641fa0656654de2984919df0ddfc536"; + hash = "sha256-E5mMI5f9FS4zqiQrMQ5A8OHjhV6vCmH2ZNgjpMr9Z18="; + }; + + __structuredAttrs = true; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + click + neo4j + pyyaml + requests + rich + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytest-cov-stub + pytest-mock + pytestCheckHook + types-pyyaml + types-requests + ]; + + pythonImportsCheck = [ "runoff" ]; + + disabledTests = [ + # rich.errors.MissingStyle: Failed to get style 'warn'... + "test_with_results" + ]; + + meta = { + description = "Active Directory security audit tool"; + homepage = "https://github.com/Real-Fruit-Snacks/Runoff"; + changelog = "https://github.com/Real-Fruit-Snacks/Runoff/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "runoff"; + }; +}) From 4c9cd46a439c1669b1fac3d0f323a6bee576fa91 Mon Sep 17 00:00:00 2001 From: Jonathan King Date: Mon, 11 May 2026 16:57:18 +0100 Subject: [PATCH 0271/1079] libpq: support dontDisableStatic Bring libpq into line with `pkgs/servers/sql/postgresql/generic.nix`, which already lets consumers retain the static archives alongside the shared libraries by setting `dontDisableStatic = true`. libpq's `postInstall` previously deleted every `.a` from `$dev/lib` unconditionally on non-static builds; consumers that need both the shared library and a native-ELF static archive had no in-tree way to keep them. The default behaviour is preserved: when `dontDisableStatic` is unset or `false`, the `.a` files are still removed, and the resulting `postInstall` string is identical to the previous one, so the derivation hash for existing consumers does not change. --- pkgs/servers/sql/postgresql/libpq.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix index 393341f0c919..2170f5cb2782 100644 --- a/pkgs/servers/sql/postgresql/libpq.nix +++ b/pkgs/servers/sql/postgresql/libpq.nix @@ -163,7 +163,13 @@ stdenv.mkDerivation (finalAttrs: { ''; # PostgreSQL always builds both shared and static libs, so we delete those we don't want. - postInstall = if stdenv.hostPlatform.isStatic then "touch $out/empty" else "rm -rfv $dev/lib/*.a"; + # Honour the `dontDisableStatic` convention (see `generic.nix`) so consumers can keep + # the static archives in `$dev/lib` alongside the shared libraries in `$out/lib`. + postInstall = + if stdenv.hostPlatform.isStatic then + "touch $out/empty" + else + lib.optionalString (!(finalAttrs.dontDisableStatic or false)) "rm -rfv $dev/lib/*.a"; doCheck = false; From dfa7f5b994c72763cb533f24fc85a3d1cb2141bc Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 12 Apr 2026 12:18:12 +0200 Subject: [PATCH 0272/1079] pnpm: refactor derivation Signed-off-by: Sefa Eyeoglu --- pkgs/development/tools/pnpm/generic.nix | 28 ++++++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 1dbdec7c5c8b..82253bf52d46 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -8,10 +8,12 @@ installShellFiles, nodejs, testers, + buildPackages, + bashNonInteractive, + withNode ? true, version, hash, - buildPackages, }: let majorVersion = lib.versions.major version; @@ -24,19 +26,23 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://registry.npmjs.org/pnpm/-/pnpm-${finalAttrs.version}.tgz"; inherit hash; }; - # Remove binary files from src, we don't need them, and this way we make sure - # our distribution is free of binaryNativeCode - preConfigure = '' - rm -r dist/reflink.*node dist/vendor - ''; - - buildInputs = lib.optionals withNode [ nodejs ]; nativeBuildInputs = [ installShellFiles nodejs ]; + buildInputs = [ + bashNonInteractive # needed for node-gyp wrapper script + ] + ++ lib.optionals withNode [ nodejs ]; + + # Remove binary files from src, we don't need them, and this way we make sure + # our distribution is free of binaryNativeCode + postUnpack = '' + rm -r package/dist/reflink.*node package/dist/vendor + ''; + installPhase = '' runHook preInstall @@ -129,6 +135,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; }; + strictDeps = true; + __structuredAttrs = true; + + dontBuild = true; + dontConfigure = true; + meta = { description = "Fast, disk space efficient package manager for JavaScript"; homepage = "https://pnpm.io/"; From 8d092bb4671e68fb965b4471abb9409272ac6a36 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 30 Mar 2026 22:55:18 +0200 Subject: [PATCH 0273/1079] treewide: pin pnpm args to pnpm_10 Signed-off-by: Sefa Eyeoglu --- .../vscode/extensions/eamodio.gitlens/default.nix | 5 ++++- .../rooveterinaryinc.roo-cline/default.nix | 5 ++++- pkgs/by-name/ag/agent-browser/package.nix | 6 ++++-- pkgs/by-name/ap/apache-airflow/python-package.nix | 11 +++++++++-- pkgs/by-name/ap/apache-answer/package.nix | 7 +++++-- pkgs/by-name/au/authelia/package.nix | 6 ++++-- pkgs/by-name/au/authelia/web.nix | 4 +++- pkgs/by-name/bu/bumpp/package.nix | 6 +++++- pkgs/by-name/ch/changelogen/package.nix | 6 +++++- pkgs/by-name/cl/claude-code-router/package.nix | 6 ++++-- pkgs/by-name/co/context7-mcp/package.nix | 5 ++++- .../co/conventional-changelog-cli/package.nix | 7 +++++-- pkgs/by-name/ct/ctx7/package.nix | 6 +++++- pkgs/by-name/el/element-desktop/package.nix | 4 +++- pkgs/by-name/el/element-web-unwrapped/package.nix | 5 ++++- pkgs/by-name/fr/froide/package.nix | 10 ++++++++-- pkgs/by-name/gi/gitbutler/package.nix | 7 +++++-- pkgs/by-name/gi/gitea/package.nix | 5 ++++- pkgs/by-name/go/goaway/package.nix | 5 ++++- pkgs/by-name/he/headplane/package.nix | 1 + pkgs/by-name/ki/kilocode-cli/package.nix | 6 +++++- pkgs/by-name/mc/mcporter/package.nix | 7 +++++-- pkgs/by-name/me/memos/package.nix | 5 ++++- pkgs/by-name/mg/mgrep/package.nix | 6 +++++- pkgs/by-name/mo/moonlight/package.nix | 6 +++++- pkgs/by-name/ni/ni/package.nix | 6 +++++- pkgs/by-name/nr/nrm/package.nix | 7 +++++-- pkgs/by-name/pa/paperless-ngx/package.nix | 4 +++- pkgs/by-name/pi/picgo/package.nix | 7 +++++-- pkgs/by-name/po/postcss/package.nix | 7 +++++-- pkgs/by-name/sa/satisfactorymodmanager/package.nix | 7 +++++-- pkgs/by-name/se/session-desktop/package.nix | 4 +++- pkgs/by-name/sf/sftool-gui/package.nix | 6 +++++- pkgs/by-name/sh/shiru/package.nix | 4 +++- pkgs/by-name/sh/shoko-webui/package.nix | 6 +++++- pkgs/by-name/sh/shopify-cli/package.nix | 5 ++++- pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix | 2 +- pkgs/by-name/sk/skills/package.nix | 6 +++++- pkgs/by-name/sl/slidev-cli/package.nix | 6 +++++- pkgs/by-name/sp/sparkle/package.nix | 4 ++-- pkgs/by-name/su/sub-store-frontend/package.nix | 5 +++-- pkgs/by-name/su/sub-store/package.nix | 5 +++-- pkgs/by-name/sv/svelte-check/package.nix | 6 +++++- pkgs/by-name/sv/svelte-language-server/package.nix | 6 +++++- pkgs/by-name/ta/tabularis/package.nix | 6 +++++- pkgs/by-name/ty/typespec/package.nix | 5 ++++- pkgs/by-name/um/umami/package.nix | 5 ++++- pkgs/by-name/ve/vencord/package.nix | 7 +++++-- pkgs/by-name/vu/vue-language-server/package.nix | 6 +++++- pkgs/by-name/za/zashboard/package.nix | 5 +++-- .../python-modules/django-filingcabinet/default.nix | 13 ++++++++++--- .../python-modules/yt-dlp-ejs/default.nix | 7 +++++-- .../continuous-integration/woodpecker/webui.nix | 5 ++++- .../custom-sidebar/package.nix | 7 +++++-- .../custom-lovelace-modules/kiosk-mode/package.nix | 7 +++++-- pkgs/servers/web-apps/discourse/default.nix | 7 ++++--- 56 files changed, 250 insertions(+), 80 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix index ad57d3e15f26..8a6ae2e09101 100644 --- a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix +++ b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix @@ -3,7 +3,7 @@ pkgs, stdenv, fetchFromGitHub, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -12,6 +12,8 @@ }: let + pnpm = pnpm_10; + vsix = stdenv.mkDerivation (finalAttrs: { name = "gitlens-${finalAttrs.version}.vsix"; pname = "gitlens-vsix"; @@ -26,6 +28,7 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-Yuxuqr1BiviSw+dGNHLs2jAy8ADlBvRks6Kmy7FmCMw="; }; diff --git a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix index 627b30007bdb..ce082884d3d2 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -11,6 +11,8 @@ }: let + pnpm = pnpm_10; + vsix = stdenvNoCC.mkDerivation (finalAttrs: { name = "roo-code-${finalAttrs.version}.vsix"; pname = "roo-code-vsix"; @@ -25,6 +27,7 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-t2sPuhn8xdk6hGfmViPGG+5TAhtBBOMYNoOb6DlPzws="; }; diff --git a/pkgs/by-name/ag/agent-browser/package.nix b/pkgs/by-name/ag/agent-browser/package.nix index 327271bcb537..443788e686b5 100644 --- a/pkgs/by-name/ag/agent-browser/package.nix +++ b/pkgs/by-name/ag/agent-browser/package.nix @@ -5,7 +5,7 @@ fetchPnpmDeps, rustPlatform, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, geist-font, nix-update-script, @@ -14,6 +14,8 @@ }: let + pnpm = pnpm_10; + version = "0.27.0"; src = fetchFromGitHub { @@ -39,7 +41,7 @@ let pnpmDeps = fetchPnpmDeps { pname = "agent-browser-dashboard"; - inherit version src; + inherit version src pnpm; pnpmWorkspaces = [ "dashboard" ]; fetcherVersion = 3; hash = "sha256-ldxmXpejqVN/xuWcdLYMwNPc1VZ1rdNwRrumy8Is3N4="; diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index e7b0674f5b57..730dc2d4a2f2 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -7,7 +7,7 @@ # javascript fetchPnpmDeps, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, # python @@ -97,6 +97,8 @@ let hash = "sha256-qFgI65wAttERPCHn7ezSdNGB0sclEV7zYIBqaC0Gs4A="; }; + pnpm = pnpm_10; + airflowUi = stdenv.mkDerivation rec { pname = "airflow-ui-assets"; inherit src version; @@ -110,7 +112,12 @@ let pnpmDeps = fetchPnpmDeps { pname = "airflow-ui"; - inherit sourceRoot src version; + inherit + sourceRoot + src + version + pnpm + ; fetcherVersion = 3; hash = "sha256-zPIql9rP4EkE0Y3ihP4MkWTTYCIDr8d1LpE6vePiNdU="; }; diff --git a/pkgs/by-name/ap/apache-answer/package.nix b/pkgs/by-name/ap/apache-answer/package.nix index ae23d134d633..b83f69f92c2f 100644 --- a/pkgs/by-name/ap/apache-answer/package.nix +++ b/pkgs/by-name/ap/apache-answer/package.nix @@ -4,11 +4,13 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, stdenv, }: - +let + pnpm = pnpm_10; +in buildGoModule (finalAttrs: { pname = "apache-answer"; version = "1.7.1"; @@ -28,6 +30,7 @@ buildGoModule (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) src version pname; + inherit pnpm; sourceRoot = "${finalAttrs.src.name}/ui"; fetcherVersion = 3; hash = "sha256-0Jqe0wig28Vb9y0/tZHDfE49MehNR7kJTpChz616tzU="; diff --git a/pkgs/by-name/au/authelia/package.nix b/pkgs/by-name/au/authelia/package.nix index 1db561604cfa..280b70dffc73 100644 --- a/pkgs/by-name/au/authelia/package.nix +++ b/pkgs/by-name/au/authelia/package.nix @@ -4,7 +4,7 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, fetchFromGitHub, buildGo125Module, installShellFiles, @@ -15,13 +15,15 @@ nodejs fetchPnpmDeps pnpmConfigHook - pnpm + pnpm_10 fetchFromGitHub ; }, }: let + pnpm = pnpm_10; + buildGoModule = buildGo125Module; inherit (import ./sources.nix { inherit fetchFromGitHub; }) diff --git a/pkgs/by-name/au/authelia/web.nix b/pkgs/by-name/au/authelia/web.nix index dd4f8851f0c8..3f5336adfca7 100644 --- a/pkgs/by-name/au/authelia/web.nix +++ b/pkgs/by-name/au/authelia/web.nix @@ -3,11 +3,13 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, fetchFromGitHub, }: let + pnpm = pnpm_10; + inherit (import ./sources.nix { inherit fetchFromGitHub; }) pname version diff --git a/pkgs/by-name/bu/bumpp/package.nix b/pkgs/by-name/bu/bumpp/package.nix index 8d0d34035e6b..d80ee5affbab 100644 --- a/pkgs/by-name/bu/bumpp/package.nix +++ b/pkgs/by-name/bu/bumpp/package.nix @@ -5,11 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, versionCheckHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "bumpp"; version = "11.0.1"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-nIj4S5BWTaw3RVNIxbla8Q31wvK67Of6psx5wX9ID+E="; }; diff --git a/pkgs/by-name/ch/changelogen/package.nix b/pkgs/by-name/ch/changelogen/package.nix index e4452f35f38f..4b55fa64c3ed 100644 --- a/pkgs/by-name/ch/changelogen/package.nix +++ b/pkgs/by-name/ch/changelogen/package.nix @@ -5,10 +5,13 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "changelogen"; version = "0.6.2"; @@ -22,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-S+GxeljcPj/MzBkleVNgaRa8D4kmHrKwwVqakmB5sAw="; }; diff --git a/pkgs/by-name/cl/claude-code-router/package.nix b/pkgs/by-name/cl/claude-code-router/package.nix index 1fd4c1903c31..fd21043b3c6f 100644 --- a/pkgs/by-name/cl/claude-code-router/package.nix +++ b/pkgs/by-name/cl/claude-code-router/package.nix @@ -4,12 +4,14 @@ lib, makeBinaryWrapper, nodejs, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, versionCheckHook, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "claude-code-router"; version = "2.0.0"; diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix index 20492fbabd6c..7544d9edaa64 100644 --- a/pkgs/by-name/co/context7-mcp/package.nix +++ b/pkgs/by-name/co/context7-mcp/package.nix @@ -7,12 +7,14 @@ versionCheckHook, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, fetchPnpmDeps, }: let tag-prefix = "@upstash/context7-mcp"; + + pnpm = pnpm_10; in stdenv.mkDerivation (finalAttrs: { pname = "context7-mcp"; @@ -34,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-f3PXpCdmKh2LPD5VyFsRdLR7CEvh+GozkQFSeeNuj2c="; }; diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix index f48c185548db..6c2ee732f9fe 100644 --- a/pkgs/by-name/co/conventional-changelog-cli/package.nix +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -5,12 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, makeBinaryWrapper, versionCheckHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "conventional-changelog-cli"; version = "7.2.0"; @@ -24,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-O91ypnycBwkfLSruezx9E5CrytguBdtmvgVhKFjUzvM="; }; diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix index 9df02ddda524..132a6b753e4a 100644 --- a/pkgs/by-name/ct/ctx7/package.nix +++ b/pkgs/by-name/ct/ctx7/package.nix @@ -7,10 +7,13 @@ versionCheckHook, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, fetchPnpmDeps, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "ctx7"; version = "0.3.9"; @@ -31,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-8RRHfCTZVC91T1Qx+ACCo2oG4ZwMNy5WYakCjmBhe3Q="; }; diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index c4cba7c6d64b..fe6791b038ba 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -15,7 +15,7 @@ commandLineArgs ? "", fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, asar, copyDesktopItems, darwin, @@ -23,6 +23,7 @@ }: let + pnpm = pnpm_10; electron = electron_41; seshat = callPackage ./seshat { }; in @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { version src ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk="; }; diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index bd13a9fc861b..a0d22d6c73c9 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -6,12 +6,14 @@ nodejs, jitsi-meet, fetchPnpmDeps, - pnpm, + pnpm_10, pnpmConfigHook, faketty, }: let + pnpm = pnpm_10; + noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org }; @@ -36,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { pname = "element"; inherit (finalAttrs) version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-0yqWObZtRntsH7gk+OB8pMuWsrvCQ4L9173Qv0o5abk="; }; diff --git a/pkgs/by-name/fr/froide/package.nix b/pkgs/by-name/fr/froide/package.nix index cc7bde39533a..29ac289460c0 100644 --- a/pkgs/by-name/fr/froide/package.nix +++ b/pkgs/by-name/fr/froide/package.nix @@ -8,13 +8,14 @@ geos, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, postgresql, postgresqlTestHook, playwright-driver, }: let + pnpm = pnpm_10; python = python3Packages.python.override { packageOverrides = self: super: { @@ -120,7 +121,12 @@ python.pkgs.buildPythonApplication rec { ]; pnpmDeps = fetchPnpmDeps { - inherit pname version src; + inherit + pname + version + src + pnpm + ; fetcherVersion = 3; hash = "sha256-NbfCVD+gmtoxuYUCumTKj9P72utK787VdlnuU4lMMGc="; }; diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 8acddb6fb185..07c6d25cb601 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -19,7 +19,7 @@ pkg-config, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, rust, rustPlatform, turbo, @@ -27,7 +27,9 @@ wrapGAppsHook4, dart-sass, }: - +let + pnpm = pnpm_10; +in rustPlatform.buildRustPackage (finalAttrs: { pname = "gitbutler"; version = "0.19.7"; @@ -58,6 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-eRiFA5lXpPHQwlyFmKMx1zmHH2zLCHB+3s708g6srg4="; }; diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index dde80c010b73..bd18a6031ecf 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -13,19 +13,22 @@ openssh, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, stdenv, sqliteSupport ? true, nixosTests, }: let + pnpm = pnpm_10; + frontend = stdenv.mkDerivation (finalAttrs: { pname = "gitea-frontend"; inherit (gitea) src version; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-dewYYPO2wmNyYiQadoEKWJ10cghm6Lv7UE1iVlyNiEY="; }; diff --git a/pkgs/by-name/go/goaway/package.nix b/pkgs/by-name/go/goaway/package.nix index 3f9131cfaf61..a0e9cb7965eb 100644 --- a/pkgs/by-name/go/goaway/package.nix +++ b/pkgs/by-name/go/goaway/package.nix @@ -6,12 +6,14 @@ makeWrapper, net-tools, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, stdenvNoCC, }: let + pnpm = pnpm_10; + version = "0.63.15"; src = fetchFromGitHub { @@ -27,6 +29,7 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; sourceRoot = "${finalAttrs.src.name}/client"; fetcherVersion = 3; hash = "sha256-GM86Os1OQaagD61BEIIsqhWJNVPFA9Z5RiYWyHlQlwY="; diff --git a/pkgs/by-name/he/headplane/package.nix b/pkgs/by-name/he/headplane/package.nix index a596e5918356..2d71367644ea 100644 --- a/pkgs/by-name/he/headplane/package.nix +++ b/pkgs/by-name/he/headplane/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + pnpm = pnpm_10; hash = pnpmDepsHash; fetcherVersion = 3; }; diff --git a/pkgs/by-name/ki/kilocode-cli/package.nix b/pkgs/by-name/ki/kilocode-cli/package.nix index e86cbcf5bb0b..e12c8b0c31b9 100644 --- a/pkgs/by-name/ki/kilocode-cli/package.nix +++ b/pkgs/by-name/ki/kilocode-cli/package.nix @@ -8,7 +8,7 @@ nodejs, writableTmpDirAsHomeHook, pnpmConfigHook, - pnpm, + pnpm_10, unzip, patchelf, autoPatchelfHook, @@ -16,6 +16,9 @@ versionCheckHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "kilocode-cli"; version = "0.25.1"; @@ -29,6 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-Q/LamZwVaIQVILtXRi1RQrYtpxYJWEKPAt3knwm47S0="; }; diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix index 5eb9e42d0dd8..cffa8b07821f 100644 --- a/pkgs/by-name/mc/mcporter/package.nix +++ b/pkgs/by-name/mc/mcporter/package.nix @@ -5,12 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, versionCheckHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "mcporter"; version = "0.10.2"; @@ -24,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-TZfEoUSjba8cRz6L9uY2PGskYsR7S/xAahiKLd8dhFM="; }; diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index 805ca74c1352..bd2ee2ad634d 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -7,9 +7,11 @@ lib, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, }: let + pnpm = pnpm_10; + version = "0.25.3"; src = fetchFromGitHub { owner = "usememos"; @@ -23,6 +25,7 @@ let inherit version src; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; sourceRoot = "${finalAttrs.src.name}/web"; fetcherVersion = 3; hash = "sha256-xEOnxCgBD4uLypcZzCO+31S4r0sSfz8PpgEmZASeRZ4="; diff --git a/pkgs/by-name/mg/mgrep/package.nix b/pkgs/by-name/mg/mgrep/package.nix index 6d6673521f7f..0ac21b3c56d3 100644 --- a/pkgs/by-name/mg/mgrep/package.nix +++ b/pkgs/by-name/mg/mgrep/package.nix @@ -1,15 +1,18 @@ { lib, + pnpm_10, stdenv, fetchFromGitHub, nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, npmHooks, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "mgrep"; version = "0.1.10"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-T1mbRDBLU4SjZSgqyKgusZe5UV9hI+/bAmBYoAWcWtQ="; }; diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix index d5fc3de191b8..b4f00cfed13a 100644 --- a/pkgs/by-name/mo/moonlight/package.nix +++ b/pkgs/by-name/mo/moonlight/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -12,6 +12,9 @@ discord-canary, discord-development, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "moonlight"; version = "2026.5.0"; @@ -31,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-veZx/b+cvpcRh1xXO8Y34dJtY2cgncqVSYYywb85Geo="; }; diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index 619549072a3c..e885f5a3703b 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -5,11 +5,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, npmHooks, versionCheckHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "ni"; version = "30.1.0"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-I/jf6nlsKQFrYLO15f+CWdPPdEpVDDMBQodLsbG4sqw="; }; diff --git a/pkgs/by-name/nr/nrm/package.nix b/pkgs/by-name/nr/nrm/package.nix index 7e814d867a14..f01121f472de 100644 --- a/pkgs/by-name/nr/nrm/package.nix +++ b/pkgs/by-name/nr/nrm/package.nix @@ -5,11 +5,13 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, makeBinaryWrapper, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "nrm"; version = "2.1.0"; @@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-DvhUXkh9Ijuik9uWzPOtM1idSNSaJxDiRHWpUMepf3U="; }; diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index 1991beab067c..084331ade53a 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -18,7 +18,7 @@ tesseract5, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, poppler-utils, liberation_ttf, xcbuild, @@ -29,6 +29,8 @@ lndir, }: let + pnpm = pnpm_10; + version = "2.20.15"; src = fetchFromGitHub { diff --git a/pkgs/by-name/pi/picgo/package.nix b/pkgs/by-name/pi/picgo/package.nix index 773264d13e62..6692f1434b70 100644 --- a/pkgs/by-name/pi/picgo/package.nix +++ b/pkgs/by-name/pi/picgo/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nodejs_22, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, electron_40, @@ -13,7 +13,9 @@ writableTmpDirAsHomeHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "picgo"; version = "2.5.3"; @@ -27,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) version src; + inherit pnpm; pname = "picgo"; hash = "sha256-tILvWDoHAN5XT1F/cJYgfeMzowuO/fhiughI+0FvHzc="; fetcherVersion = 3; # lockfileVersion 9.0 corresponds to fetcherVersion 3 diff --git a/pkgs/by-name/po/postcss/package.nix b/pkgs/by-name/po/postcss/package.nix index 3fc2a6198896..7ba6581adad9 100644 --- a/pkgs/by-name/po/postcss/package.nix +++ b/pkgs/by-name/po/postcss/package.nix @@ -4,11 +4,13 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "postcss"; version = "8.5.10"; @@ -28,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-7SwgvsbSbRj1SZAEhjWp3B4D3VtAvg7UN35/5x3f5Wk="; }; diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix index b190ffa04be3..8453d212767d 100644 --- a/pkgs/by-name/sa/satisfactorymodmanager/package.nix +++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix @@ -3,7 +3,7 @@ stdenv, buildGoModule, fetchFromGitHub, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, wails, @@ -12,7 +12,9 @@ makeDesktopItem, copyDesktopItems, }: - +let + pnpm = pnpm_10; +in buildGoModule rec { pname = "satisfactorymodmanager"; version = "3.0.5"; @@ -58,6 +60,7 @@ buildGoModule rec { pname version src + pnpm ; sourceRoot = "${src.name}/frontend"; fetcherVersion = 3; diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix index 2d7d87a48ba1..c25c9ed69c06 100644 --- a/pkgs/by-name/se/session-desktop/package.nix +++ b/pkgs/by-name/se/session-desktop/package.nix @@ -8,7 +8,7 @@ makeWrapper, fetchpatch, replaceVars, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, rustPlatform, @@ -27,6 +27,8 @@ }: let + pnpm = pnpm_10; + fake-git = writeShellScriptBin "git" (lib.readFile ./fake-git.sh); libsession-util-nodejs = stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/sf/sftool-gui/package.nix b/pkgs/by-name/sf/sftool-gui/package.nix index f3093c92e031..1f5e876ad3ba 100644 --- a/pkgs/by-name/sf/sftool-gui/package.nix +++ b/pkgs/by-name/sf/sftool-gui/package.nix @@ -1,5 +1,6 @@ { lib, + pnpm_10, stdenv, rustPlatform, cargo-tauri, @@ -9,7 +10,6 @@ systemdLibs, fetchPnpmDeps, pnpmConfigHook, - pnpm, openssl, nix-update-script, pkg-config, @@ -18,6 +18,9 @@ autoPatchelfHook, fetchFromGitHub, }: +let + pnpm = pnpm_10; +in rustPlatform.buildRustPackage (finalAttrs: { pname = "sftool-gui"; version = "1.1.4-unstable-2026-04-16"; @@ -41,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { fetcherVersion = 3; inherit (finalAttrs) pname version src; + inherit pnpm; hash = "sha256-DwDXfbwgt/OSNOQbzCBlathX9QDnbEsXZLsgB67LOEk="; }; diff --git a/pkgs/by-name/sh/shiru/package.nix b/pkgs/by-name/sh/shiru/package.nix index 71f050bff3e9..6a1edc181684 100644 --- a/pkgs/by-name/sh/shiru/package.nix +++ b/pkgs/by-name/sh/shiru/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - pnpm, + pnpm_10, nodejs, fetchFromGitHub, python3, @@ -14,6 +14,7 @@ nix-update-script, }: let + pnpm = pnpm_10; electron = electron_39; in stdenv.mkDerivation (finalAttrs: { @@ -44,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; prePnpmInstall = '' cd electron ''; diff --git a/pkgs/by-name/sh/shoko-webui/package.nix b/pkgs/by-name/sh/shoko-webui/package.nix index b537f3d6e6d3..5e25f5c5bf22 100644 --- a/pkgs/by-name/sh/shoko-webui/package.nix +++ b/pkgs/by-name/sh/shoko-webui/package.nix @@ -3,12 +3,15 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, lib, shoko, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "shoko-webui"; version = "2.4.1"; @@ -27,6 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-rTlem83dFptgvKUKUaHK8vi5B0FBehPFtkCUhOnUKd0="; }; diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix index 52bed4866986..3bbfbfad441c 100644 --- a/pkgs/by-name/sh/shopify-cli/package.nix +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, faketty, nodejs_22, versionCheckHook, @@ -12,6 +12,8 @@ nix-update-script, }: let + pnpm = pnpm_10; + nodejs = nodejs_22; pnpm' = pnpm.override { inherit nodejs; }; in @@ -28,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-gwEVlvr8hxgyCsGjxjz1UkbDZYYq1iukKTPJ7JHdo2U="; }; diff --git a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix index 19de85ad5277..a55faadb62c7 100644 --- a/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix +++ b/pkgs/by-name/si/signal-desktop/signal-sqlcipher.nix @@ -1,8 +1,8 @@ { stdenv, + pnpm, lib, fetchFromGitHub, - pnpm, fetchPnpmDeps, pnpmConfigHook, nodejs, diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix index 7fbaff73ff6e..9a8cabd2aa40 100644 --- a/pkgs/by-name/sk/skills/package.nix +++ b/pkgs/by-name/sk/skills/package.nix @@ -3,12 +3,15 @@ stdenv, fetchFromGitHub, fetchPnpmDeps, - pnpm, + pnpm_10, nodejs, pnpmConfigHook, nix-update-script, testers, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "skills"; version = "1.5.1"; @@ -23,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { fetcherVersion = 3; inherit (finalAttrs) pname version src; + inherit pnpm; hash = "sha256-0CS6BTjTj/TAnMNahTk4Vt/0/2eMxmCGUV9PwI8l4Ao="; }; diff --git a/pkgs/by-name/sl/slidev-cli/package.nix b/pkgs/by-name/sl/slidev-cli/package.nix index 1cf9d00585b2..a73a7378e8a5 100644 --- a/pkgs/by-name/sl/slidev-cli/package.nix +++ b/pkgs/by-name/sl/slidev-cli/package.nix @@ -3,11 +3,14 @@ stdenv, fetchFromGitHub, fetchPnpmDeps, - pnpm, + pnpm_10, nodejs, pnpmConfigHook, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "slidev-cli"; version = "52.15.1"; @@ -28,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-DGDzNvau1XjPjkGZqcFZGkjYd3cneXO/gCdnwjjkQDY="; }; diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix index 17bb24a7275d..bd10387d4e03 100644 --- a/pkgs/by-name/sp/sparkle/package.nix +++ b/pkgs/by-name/sp/sparkle/package.nix @@ -22,6 +22,8 @@ }: let + pnpm = pnpm_10_29_2; + sparkle-service = buildGoModule { pname = "sparkle-service"; version = "0-unstable-2025-10-24"; @@ -37,8 +39,6 @@ let meta.mainProgram = "sparkle-service"; }; - - pnpm = pnpm_10_29_2; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix index 3de1b23a1b9e..0bb281c721b5 100644 --- a/pkgs/by-name/su/sub-store-frontend/package.nix +++ b/pkgs/by-name/su/sub-store-frontend/package.nix @@ -4,13 +4,14 @@ fetchFromGitHub, pnpm_10, - pnpm ? pnpm_10, fetchPnpmDeps, pnpmConfigHook, nix-update-script, nodejs, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "sub-store-frontend"; version = "2.16.79"; diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix index 8b7b2580f12a..b1f1587bcd10 100644 --- a/pkgs/by-name/su/sub-store/package.nix +++ b/pkgs/by-name/su/sub-store/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, pnpm_10, - pnpm ? pnpm_10, fetchPnpmDeps, pnpmConfigHook, makeBinaryWrapper, @@ -12,7 +11,9 @@ nodejs, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "sub-store"; version = "2.22.15"; diff --git a/pkgs/by-name/sv/svelte-check/package.nix b/pkgs/by-name/sv/svelte-check/package.nix index 98a09588b8f1..c2db29dcf953 100644 --- a/pkgs/by-name/sv/svelte-check/package.nix +++ b/pkgs/by-name/sv/svelte-check/package.nix @@ -4,11 +4,14 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, makeBinaryWrapper, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "svelte-check"; version = "4.3.1"; @@ -29,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-43AIkVzpcq/Y+QO2k7pkr6CN340idXJEpie0gVdxra8="; }; diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix index 533851c95ed9..4b35a31e042d 100644 --- a/pkgs/by-name/sv/svelte-language-server/package.nix +++ b/pkgs/by-name/sv/svelte-language-server/package.nix @@ -4,11 +4,14 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, makeBinaryWrapper, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "svelte-language-server"; version = "0.17.31"; @@ -29,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-x0yIANla1KURJ4fgxAe9WUJl/sPAsUcARubTJQ5uEpQ="; }; diff --git a/pkgs/by-name/ta/tabularis/package.nix b/pkgs/by-name/ta/tabularis/package.nix index 3668c683d48c..513d5fad50f6 100644 --- a/pkgs/by-name/ta/tabularis/package.nix +++ b/pkgs/by-name/ta/tabularis/package.nix @@ -6,7 +6,7 @@ fetchPnpmDeps, cargo-tauri, nodejs, - pnpm, + pnpm_10, pnpmConfigHook, wrapGAppsHook4, webkitgtk_4_1, @@ -14,6 +14,9 @@ openssl, nix-update-script, }: +let + pnpm = pnpm_10; +in rustPlatform.buildRustPackage (finalAttrs: { pname = "tabularis"; version = "0.9.12"; @@ -38,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-S/XCypKyYlJtuISNiG8NtJzisAejiUwqPVltXEmVlZw="; }; diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix index 8ebb5226dd57..45ba2f5853f3 100644 --- a/pkgs/by-name/ty/typespec/package.nix +++ b/pkgs/by-name/ty/typespec/package.nix @@ -7,12 +7,14 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, versionCheckHook, }: let workspace = "@typespec/compiler..."; + + pnpm = pnpm_10; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "typespec"; @@ -41,6 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces postPatch ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-wZvnRSALrupyhpSN8zNL3b6SZnVPXX3BdHrbzHUNtUg="; }; diff --git a/pkgs/by-name/um/umami/package.nix b/pkgs/by-name/um/umami/package.nix index 058505f9846e..d5a95c25f349 100644 --- a/pkgs/by-name/um/umami/package.nix +++ b/pkgs/by-name/um/umami/package.nix @@ -9,7 +9,7 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, prisma_7, prisma-engines_7, openssl, @@ -20,6 +20,8 @@ basePath ? "", }: let + pnpm = pnpm_10; + sources = lib.importJSON ./sources.json; geocities = stdenvNoCC.mkDerivation { @@ -107,6 +109,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { version src ; + inherit pnpm; fetcherVersion = 3; hash = "sha256-QNWmCsVFh8xpsO4ZPTaKGszwuRaxTrWLMVh/6VV5oIw="; }; diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index c0618fd6c98a..866e5c01d1b3 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -17,6 +17,9 @@ discord-development, buildWebExtension ? false, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "vencord"; version = "1.14.13"; @@ -42,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { patches postPatch ; - pnpm = pnpm_10; + inherit pnpm; fetcherVersion = 3; hash = "sha256-hk1rnNog5xvuIVI0M1ZJ5xrEuk0zcBiYsbROUycdi+A="; }; @@ -51,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { git nodejs pnpmConfigHook - pnpm_10 + pnpm ]; env = { diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 06c129532f6c..0a09412135f4 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -4,11 +4,14 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, nix-update-script, makeBinaryWrapper, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "vue-language-server"; version = "3.2.6"; @@ -22,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-koRJkT/JloptmtQKLprqms53TL/Q4XHaktIl/6PIasw="; }; diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index e51531e8ab94..a312f87604df 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -3,12 +3,13 @@ buildNpmPackage, fetchFromGitHub, pnpm_10, - pnpm ? pnpm_10, fetchPnpmDeps, pnpmConfigHook, nix-update-script, }: - +let + pnpm = pnpm_10; +in buildNpmPackage (finalAttrs: { pname = "zashboard"; version = "3.5.1"; diff --git a/pkgs/development/python-modules/django-filingcabinet/default.nix b/pkgs/development/python-modules/django-filingcabinet/default.nix index 9dd305b3ad37..c98095bd08a1 100644 --- a/pkgs/development/python-modules/django-filingcabinet/default.nix +++ b/pkgs/development/python-modules/django-filingcabinet/default.nix @@ -31,12 +31,14 @@ playwright-driver, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, markdown, nh3, }: - +let + pnpm = pnpm_10; +in buildPythonPackage rec { pname = "django-filingcabinet"; version = "0.17-unstable-2025-08-14"; @@ -96,7 +98,12 @@ buildPythonPackage rec { }; pnpmDeps = fetchPnpmDeps { - inherit pname version src; + inherit + pname + version + src + pnpm + ; fetcherVersion = 3; hash = "sha256-p+RpEDVbdYmeSD4bB0oUMrTpsVDGYkqME13awnoTNd0="; }; diff --git a/pkgs/development/python-modules/yt-dlp-ejs/default.nix b/pkgs/development/python-modules/yt-dlp-ejs/default.nix index 4157f6d99236..d53cade836be 100644 --- a/pkgs/development/python-modules/yt-dlp-ejs/default.nix +++ b/pkgs/development/python-modules/yt-dlp-ejs/default.nix @@ -7,9 +7,11 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, }: - +let + pnpm = pnpm_10; +in buildPythonPackage rec { pname = "yt-dlp-ejs"; version = "0.8.0"; @@ -27,6 +29,7 @@ buildPythonPackage rec { pname version src + pnpm ; fetcherVersion = 3; hash = "sha256-4qMOAl9Dbe1oYSRIeP7oPcV/+P8NLdIYvSNxaz0h+Z0="; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix index 31197106a149..a4b8f9312f3e 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix @@ -5,10 +5,12 @@ nodejs, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, }: let common = callPackage ./common.nix { }; + + pnpm = pnpm_10; in stdenv.mkDerivation (finalAttrs: { pname = "woodpecker-webui"; @@ -18,6 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; sourceRoot = "${common.src.name}/web"; fetcherVersion = 3; hash = common.nodeModulesHash; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix index 1d3bf1706612..935a7bdba7d4 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix @@ -4,10 +4,12 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, }: - +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "custom-sidebar"; version = "14.0.0"; @@ -21,6 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-gYNCjCeAt6LP4tZE4ufiQu7OG2ujWydm4etcGQxMxcU="; }; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix index 7b29dd502564..f85502db309a 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/kiosk-mode/package.nix @@ -4,10 +4,12 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm, + pnpm_10, nodejs, }: - +let + pnpm = pnpm_10; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "kiosk-mode"; version = "13.1.0"; @@ -21,6 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "sha256-k7kXZ4yFe3As1IGijrmJfgqrMoO2Yi+PrNapuq8Ow3Y="; }; diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix index 5c572d71511d..96aba467b7be 100644 --- a/pkgs/servers/web-apps/discourse/default.nix +++ b/pkgs/servers/web-apps/discourse/default.nix @@ -39,7 +39,7 @@ buildRubyGem, rustc, cargo, - pnpm, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, svgo, @@ -62,6 +62,8 @@ let sha256 = "sha256-0jbO1rJQ0AISo7h+SZfovubReCjR2zT6KWX9LxBeFtE="; }; + pnpm = pnpm_10; + ruby = ruby_3_3; runtimeDeps = [ @@ -303,8 +305,7 @@ let pnpmDeps = fetchPnpmDeps { pname = "discourse-assets"; - inherit version src; - pnpm = pnpm; + inherit version src pnpm; fetcherVersion = 3; hash = "sha256-xft/2x0iti0yJ53uI9q2+FSvKgWWfKQzlMlPFz3RZsE="; }; From 921251820708a876752a4aa1f1f3e7b808e61ac2 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 31 Mar 2026 16:38:02 +0200 Subject: [PATCH 0274/1079] pnpm-fixup-state-db: init at 1.0.0 Signed-off-by: Sefa Eyeoglu --- .../node/fetch-pnpm-deps/default.nix | 14 ++ .../pn/pnpm-fixup-state-db/package.nix | 34 +++ .../pn/pnpm-fixup-state-db/src/.gitignore | 2 + .../pn/pnpm-fixup-state-db/src/index.ts | 61 ++++++ .../pnpm-fixup-state-db/src/package-lock.json | 200 ++++++++++++++++++ .../pn/pnpm-fixup-state-db/src/package.json | 19 ++ .../pn/pnpm-fixup-state-db/src/tsconfig.json | 10 + pkgs/development/tools/pnpm/generic.nix | 2 +- pkgs/test/pnpm/default.nix | 1 + .../test/pnpm/pnpm-fixup-state-db/default.nix | 23 ++ pkgs/test/pnpm/pnpm-fixup-state-db/index.db | Bin 0 -> 65536 bytes 11 files changed, 365 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/package.nix create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json create mode 100644 pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json create mode 100644 pkgs/test/pnpm/pnpm-fixup-state-db/default.nix create mode 100644 pkgs/test/pnpm/pnpm-fixup-state-db/index.db diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index 6b33c263b895..80b637b57ddf 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -7,6 +7,7 @@ cacert, makeSetupHook, pnpm, + pnpm-fixup-state-db, writableTmpDirAsHomeHook, yq, zstd, @@ -47,6 +48,14 @@ in }; filterFlags = lib.map (package: "--filter=${package}") pnpmWorkspaces; + + pnpm-fixup-state-db' = + if pnpm.nodejs or null != null then + pnpm-fixup-state-db.override { + inherit (pnpm) nodejs; + } + else + pnpm-fixup-state-db; in # pnpmWorkspace was deprecated, so throw if it's used. assert (lib.throwIf (args ? pnpmWorkspace) @@ -77,6 +86,7 @@ in jq moreutils pnpm # from args + pnpm-fixup-state-db' yq zstd ] @@ -146,6 +156,10 @@ in jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f done + if [ -f "$storePath/v11/index.db" ]; then + pnpm-fixup-state-db "$storePath/v11"; + fi + # This folder contains symlinks to /build/source which we don't need # since https://github.com/pnpm/pnpm/releases/tag/v10.27.0 rm -rf $storePath/{v3,v10}/projects diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix b/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix new file mode 100644 index 000000000000..66c5da928e16 --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/package.nix @@ -0,0 +1,34 @@ +{ + buildNpmPackage, + lib, + nodejs, + pnpm, + tests, +}: +buildNpmPackage { + pname = "pnpm-fixup-state-db"; + version = "1.0.0"; + + src = ./src; + + inherit nodejs; + + npmDepsHash = "sha256-um6a4pEtPtdxHBRq9g5ZW20wIQAMjWJ3qF96XuxJg8o="; + + postInstall = '' + makeWrapper ${lib.getExe nodejs} $out/bin/pnpm-fixup-state-db \ + --add-flags "$out/lib/node_modules/pnpm-fixup-state-db" + ''; + + passthru.tests = { + inherit (tests) pnpm; + }; + + __structuredAttrs = true; + + meta = { + license = lib.licenses.mit; + mainProgram = "pnpm-fixup-state-db"; + inherit (pnpm.meta) maintainers; + }; +} diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore b/pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore new file mode 100644 index 000000000000..23a608b6addd --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/.gitignore @@ -0,0 +1,2 @@ +node_modules +*.js diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts b/pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts new file mode 100644 index 000000000000..648af50f3545 --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/index.ts @@ -0,0 +1,61 @@ +#!/usr/bin/env node +import { packForStorage, StoreIndex } from '@pnpm/store.index'; + +interface FileMetadata { + checkedAt: number; +} + +interface Metadata { + files: Map; +} + +function validateMetadata(data: unknown): data is Metadata { + return (data as Metadata).files instanceof Map; +} + +// from https://github.com/pnpm/pnpm/blob/52ee08aad4fcc0dfb92bc35cc5aaf3d07f8f3246/worker/src/start.ts#L235 +function packToShared (data: unknown): Uint8Array { + const packed = packForStorage(data) + const shared = new SharedArrayBuffer(packed.byteLength) + const view = new Uint8Array(shared) + view.set(packed) + return view +} + +const main = () => { + const storePath = process.argv[2]; + const index = new StoreIndex(storePath); + + const newEntries = [] as Parameters[0] + + for (const [key, data] of index.entries()) { + console.debug(`Mapping ${key}...`); + if (!validateMetadata(data)) { + console.debug(`Data of ${key}:`, data); + throw new Error(`Failed to read data for ${key}`); + } + const newFiles = new Map(); + for (const [path, metadata] of data.files.entries()) { + newFiles.set(path, { + ...metadata, + checkedAt: 0, + }); + } + newEntries.push({ + key, + buffer: packToShared({ + ...data, + files: newFiles, + } as Metadata) + }); + } + + // As pnpm is highly parallelized, the order of the data in the database is random. Therefore, we need to sort our changed data and replace all data in the database + const sortedEntries = newEntries.sort((a, b) => a.key > b.key ? 1 : -1); + + // Delete all entries and add them in a deterministic order + index.deleteMany(sortedEntries.map(m => m.key)); + index.setRawMany(sortedEntries); +}; + +main(); diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json new file mode 100644 index 000000000000..0e0a14c8b47c --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package-lock.json @@ -0,0 +1,200 @@ +{ + "name": "pnpm-fixup-state-db", + "version": "0.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "pnpm-fixup-state-db", + "version": "0.0.0", + "license": "MIT", + "dependencies": { + "@pnpm/store.index": "^1100.0.0" + }, + "devDependencies": { + "@types/node": "^25.6.0", + "typescript": "^6.0.3" + } + }, + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz", + "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz", + "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz", + "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz", + "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz", + "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz", + "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@pnpm/store.index": { + "version": "1100.0.0", + "resolved": "https://registry.npmjs.org/@pnpm/store.index/-/store.index-1100.0.0.tgz", + "integrity": "sha512-eVd5DHiD6hyr2hrkIlh3z07SOiVqoGvFnPAb+rL6piXd9889trSyUjDXBlkJj7gyipAQoo8xMHHixoPp/sHnFA==", + "license": "MIT", + "dependencies": { + "msgpackr": "1.11.8" + }, + "engines": { + "node": ">=22.13" + }, + "funding": { + "url": "https://opencollective.com/pnpm" + } + }, + "node_modules/@types/node": { + "version": "25.6.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz", + "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~7.19.0" + } + }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "license": "Apache-2.0", + "optional": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/msgpackr": { + "version": "1.11.8", + "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.8.tgz", + "integrity": "sha512-bC4UGzHhVvgDNS7kn9tV8fAucIYUBuGojcaLiz7v+P63Lmtm0Xeji8B/8tYKddALXxJLpwIeBmUN3u64C4YkRA==", + "license": "MIT", + "optionalDependencies": { + "msgpackr-extract": "^3.0.2" + } + }, + "node_modules/msgpackr-extract": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz", + "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==", + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "dependencies": { + "node-gyp-build-optional-packages": "5.2.2" + }, + "bin": { + "download-msgpackr-prebuilds": "bin/download-prebuilds.js" + }, + "optionalDependencies": { + "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3", + "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3", + "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3" + } + }, + "node_modules/node-gyp-build-optional-packages": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz", + "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==", + "license": "MIT", + "optional": true, + "dependencies": { + "detect-libc": "^2.0.1" + }, + "bin": { + "node-gyp-build-optional-packages": "bin.js", + "node-gyp-build-optional-packages-optional": "optional.js", + "node-gyp-build-optional-packages-test": "build-test.js" + } + }, + "node_modules/typescript": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undici-types": { + "version": "7.19.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz", + "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==", + "dev": true, + "license": "MIT" + } + } +} diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json new file mode 100644 index 000000000000..17da52cd5e9e --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/package.json @@ -0,0 +1,19 @@ +{ + "name": "pnpm-fixup-state-db", + "version": "0.0.0", + "description": "Fixup pnpm v11-store index.db to remove impurities", + "license": "MIT", + "author": "Sefa Eyeoglu ", + "type": "module", + "main": "index.js", + "dependencies": { + "@pnpm/store.index": "^1100.0.0" + }, + "devDependencies": { + "@types/node": "^25.6.0", + "typescript": "^6.0.3" + }, + "scripts": { + "build": "tsc" + } +} diff --git a/pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json b/pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json new file mode 100644 index 000000000000..55cc552808e3 --- /dev/null +++ b/pkgs/by-name/pn/pnpm-fixup-state-db/src/tsconfig.json @@ -0,0 +1,10 @@ +{ + "compilerOptions": { + "module": "nodenext", + "target": "esnext", + "lib": ["esnext"], + "types": ["node"], + "strict": true + }, + "include": ["index.ts"] +} diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 82253bf52d46..76a0b40835e4 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -103,7 +103,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; }) ); - inherit majorVersion; + inherit nodejs majorVersion; tests.version = lib.optionalAttrs withNode ( testers.testVersion { package = finalAttrs.finalPackage; } diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix index 1e7d882ce295..85874ec1a57f 100644 --- a/pkgs/test/pnpm/default.nix +++ b/pkgs/test/pnpm/default.nix @@ -1,4 +1,5 @@ { callPackage }: { pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { }; + pnpm-fixup-state-db = callPackage ./pnpm-fixup-state-db { }; } diff --git a/pkgs/test/pnpm/pnpm-fixup-state-db/default.nix b/pkgs/test/pnpm/pnpm-fixup-state-db/default.nix new file mode 100644 index 000000000000..f4c47ae00efa --- /dev/null +++ b/pkgs/test/pnpm/pnpm-fixup-state-db/default.nix @@ -0,0 +1,23 @@ +{ + pnpm-fixup-state-db, + testers, + sqlite, +}: +testers.runCommand { + name = "pnpm-fixup-state-db-test"; + + nativeBuildInputs = [ + pnpm-fixup-state-db + sqlite + ]; + + script = '' + install -Dm644 ${./index.db} ./store/index.db + + pnpm-fixup-state-db ./store + + cp ./store/index.db $out + ''; + + hash = "sha256-tjpKgdMvDcs0X65PENIsiHELYPzVupEH3jS4PyLsF40="; +} diff --git a/pkgs/test/pnpm/pnpm-fixup-state-db/index.db b/pkgs/test/pnpm/pnpm-fixup-state-db/index.db new file mode 100644 index 0000000000000000000000000000000000000000..705910416a042a68be532125cea69f6f6ee943dc GIT binary patch literal 65536 zcmeI*eT-%Ic^~#&a=8*I>dlgE*^T3sElcvt&fas*z4zQ(#H~n*k|rUNp!>Ml>-_K9KWF{NnQOoC>**u^{r~o#uQ;{wH~#3={`SV# z{12yI`_b3F-Y+Nrob15K4xH@3$qt)YOT z`jdZY__!-g`%v>>|FO-ju77mxH#e+(;M!lEd;2Zt4*q$le{5LhxewlR*ZXd}=OgES z=+2M)z>&Z2n!V=S?RS6R_H*z5zz(_5 zev2Ky@s{$`YhHiroBeX~&&dv)?7+zmob15K4xH@3$qt|SgpMS1??SIQ4odmnn=y^lU{^}&bkxc`UlzUPAU*o4Y6P`|!ISdDrZocV4~s zp2zo=k39JP;*rarcyIr{dlx@+Y3t6t4}IeP+5I~g@4Ni?otJ;4yIS5geYotdT&aKf zu16pF!5_T&9ea;m>31(|ZFl`U%E`uLWAyc%cl_jMcKT0T-Q4MSZ@;>Ese9^jv$eVG zclSQkTzYW()630E{qC=Sedo5HeDdLbXLoaZ>$$GK(nH%@?PkCGsjcR6|H75N-+AYe zKYilbhu{7a&t2W>Hrvhf!%u$lKdd*3*~aMEBMbTZ&K-a2iPeMu&Z&<)dG}p+-1+`{ z@BI4CJAd-&_F~^Y)OWY-J<)AGm=#^N@K5b-KHi`D#(z|Fqv>omF2~F1ydCv*RhCV^ zsLN45?#o#>Z?dV8Z@Tel)KqO-mVLSC7SmbXbYDCDsjr>6`n0U)o$tGI<8t>- zYx051`KXx8Mw4Zg@9g_oSDIK&c`gB{Hs6tl~j>Yb!kIXh7eemwvKl~%_z3T&;AG-9R`#!$>kn%q;f{lowC{wLr5w|{nTw|#1FcemeRDNk=) z@SPX@(Pyvy*Xl2v_ivy2zR$g*yRx&nwRd4vCEe?HK7Z{`4j28ocl5i>Oi_PZq`_^@Nb8GYR=I-8e*M7h4Z=b&Q zo84>QlH2g*{XgB^zPi))=Px%`&hK8ma%Fqx;F}-0xY=I(%IeF89X-FllAWuU`ty61 z(C_@pb^h9Uzv9a`-So-bfA!Y=)4px@>K%_Sm+yYhdmmfe+uXBrd1unUXJ=Mie&oIP zR}X#sk?H%s|LT>U2OhrThd1Bfzkh!32j2b2hpP8(%|5=EU9Ns)y7~BrAAD$QtGH+M zuKVt|^R^F`AKJP5BNuYJkKVL*3>WR+;=up*wF4h+^b@OZU%R{qmvrOslHUHuT+(JT zDW*+bkGrB9FPGhD*-oePVll0n>2y3T7qiAKEBd~j&F9UccTFZuJ0ACwc0Q{X<#g0f z=aYId?@C`jZl_&aHOsDR=8Jw*^hMc}{%~AWqxq~ISHnds{B|~~tMROFhf8|aQJw{CY&yQUgVOOC=f%*WHJth?!CRuz-3UW_bb)c56R-Yys8#dy+=r(M@~eYLD+ z#i%WcWxXt`a=M&*2;O5_*OPu+@|NhW!+Yj zaWh#oRXthseYfnF^I};}t5Gp3%B<=1Z$6`^Vry@s+t}O9qLxijFDBEn7?<;f|7a#v z-&I|?SakDpUiVEqn~aM^JMLyat{#(lH1qL%IbV*d+E?{$IqurUqL@wEaxt&QMN^J^ zZ?)*Gmd2wf3(AW5yej)?YcvviO(L-`(iOJr_**;jI*S(cYS`*T#7uYJAY++`_jSU z=KZ2vR!ui;qYG(#TrpqF+rF%4?XoV*t}MFwysOK;Z|cc7KYKJ9&#F3GP%Wq9*`ywo zlV!b_bqilUiEd^xujgem8QZQ=J)2Dz<8HB}Wa;c~Ij*NwF&Zse!kT(m+>QU{i)}+f zcb;CVr)s*gx4m<)z-m4jHC^E|>WRIYk4E)qI-2&~d`fsT9hYrcj6CP8tCq`hY|p6L zCLX8l>RH{B#x%1?=8BnLJxNtm{(s&!gfR{EOz+$0)7f;i7?s7OXh$}!&snx@Z+mCi zz1Mx)Gs6N87B#E-Wig#j{p7xGY4U7HKd#D!l{FP*UA641#%WIa(X1bjCnI(=p|G1S zXRWQ6PL~vaRV08ENAtoxVcO$GU$D@w>n3GOTQpy=+gXHp%d&PZeeDz5Svy*(g?{gI z?WIk&e?Hwty9aBVP8UVJtU6!bx_GnMXg;R`vW#vvTR87_QcW4`jLA-lC3REp&Mw`E z(WGCv#%)no*03liu2NaG{=0Ezqb7UH9vrE2pH_2{L^7lWF``Q_nRJ!w&^ndg0 zYHbIrqB|NSQuVm6#uepLN5Dj@a^5W$Q_g}D81;TXnUwXioh%oN(YP*M8-mHj zxXJbK0W;R!)P>vIL_#%h7|G0GPp9R0;rDbGy`ydaTsI91#Cy$dicmrYxD4O=Pe#ge_vifK8WMMpJt;p%2?M;BaVB$sv9 z&X)_uKW1kBa8`D`f6ZrOj%~`QinbcHqseGqI-O?3S$0g(y&oLLYd>dUdpXN!3J*4| zv)5xE&*rnf+F7_d)r5@HzsA#1NhLbV-5+&Cpc5WyL_u1OmpSUGTgc4&e$*0*<$f<` zHAiP-U12`87+W4op14^HUVj`XX9rv)inD%RXKgnW&$Zjsi~XU6QH;jHH&Zur!kFC0 zn%=CjjG9xM^mbs(PHoV9-1_KpWEY%WziiuT;iAmyaW$`-iX)!!{`tyw-i+BIBElR+tCUv{4`l?;F zH8tO2#svCi!Z+H#QN0kQnAxQA7un`4@$A2PzT4cr((G|+J)$hBzt zva;WewQ``THp@ifBYnyccHr;90DY#MHe(NY;&MPd8M5qo!q z%}y(hP6VD+%SMElj}~Jwb+ETT_rHC)-+K7`#l5{N=dbK+Kl<4D^&slF#xuc&Jh*qo zc=3iVc;dLMZ(jDEz$UUHCphXB-84(>yUBRg72`3vBCk4gQ@Z$Uw`4>dIqmFG>4BQA zYUU)z#Z){QIZ``a`0zzpi@O5PDk$9W+t2npJKH;lX4fyKi>m1QW<=*KA~wa0cb(6; z1dgGw$ig>sdkc#!rX5$7_)v&&BEn4gt*U;(&)fZ$dl4B}dtY{3(PGl_I-@=jtYs)1 z`mCNY?K7aTE9A$n3)5X;;>sT&8o=q=kv zRWpy=2Eb5<5}EqLZURvVZj90aRg1cq@b#{?tsGHxw)Mm&%}1`YvvU=gMKLS*VF74X zw|wDzS`QNMSKRQ-vS(`tixMyxKm&DgTs6UYSI)}G!ZA*pvbNFPm=%^HmQ^)e+-%Y< zC*z4AIc`9wYS#5*lGv7ol7=s4RHHPf9lueu6L*7i@y9hq>ts1x}FKvTF z=dX7~NAs?2rxT%o6kbT=*SV2V+3~ER6%f>Q)3UAGc?XG>1>!qOXF#PFaJc5*( zl1C=KZF)Xh+ys%JvphE!9isqj>%tu;kYD<_(Xw)Qf)Q^C zi?B5QcuVnWj6l#`(*JR=VKCF8SS*)(Q4hd3Rma~#V`7+wjDjbg>$xZ@ z3z~KU^lS=ofwVpMR)GF}GcT&P1il>mXu8l>VKd+|030@#9+lmU`SC|pJFPe}cfh8{ zkH^bpU8n!6XD)bPE}cCRMo<;~VkF-3AAQvjsEtck{`j5Sk~@r>1Rs!SX??XsvmTH7 zkvOi6AbkX*MR2BNTf(x3A7@ixY#Ar)LptCyE>OU*f8`Vw09}}RW%o*P-bP6*BJfP!Jd*Tu&b-r+uyi*nT!2q)%EH+$q_dndXf%UK`6nV@&*oW<2%cuDT4P4hP3m#*N;QYv z#$~Cwi^aNBNvCy{SnI5b^fPz1nx)H)C7d09=%%NvQ0w(3+erH`NrE3z2giMiD;xg}na9ark z*!y`BacqMKDvhtYsvQk5_qBiiv%~tdDIs-SO+$@KI;a{e-SZflM(o3y`m1 z^=&zoYR~K)x`l)0rzUe=u7y7q?tvTI&6+8r1!sDZ4^U*Apyae*qR`A7wa~?n3u>bT z?BPsb{mcNq4|dCs?Pkkvxtt~{HFaDC?++jpr35lr7OW(I&XF+zgPlCIw_5y`T)YPc z0gc&I1Ro1r{Bbd^N3Gj9opLlCKdtkQ@wU@`ETD^e5;GBH$;bG}Eb4{_p3g=d%h^ZF z!!_ZiJNQB*aCUreT}vJ-4t>PX+Hv8TxGzbq>zuChmI}T!PF^ExQ6KX5AGm(@g7v2{< zZ(YuyU_iecvb>xAyBDsPpGbE^X4eM>=rl-S&K77(?Tb!7IUf3eH<18HssILPaXfXj z(vp}yYELr9jR^@d5vC4J@DE%+qDv4?2$Zk)PJwF%I^+syEI=a3O}`?o-l`k5=`vU5 zz`$e?ylf}2gj*r3R-SA7G+{Ci%s{Z>2=$3nvZPwAY8YTQ zYh4v{Nw|k!U`DHo?SJ)u{`_iX`w;D5+hiEpR0}Y}2FkzS=%thxx*cKQT(ufbLl({D zo}A(W%O?Pe8EhNn$}f~SEB+F@0#Gb?)8(kP)jDc@Rgglpkm<=c_)9r7%Cjj1*Rd0? zXT!GL`jwyG+18hMerH=Z=sHIllB^P}olgyDIL(GjfYs8t%fBI;>(G$4b244{3u&|6 zVO6dco(;{yww<0F1^Pm}fFHA#FPn@JCivY>p6_beYhISV}lbseAm!+36Q{ zx0)-v7q|D0!H-&2j_Kyv_$UDzUol}9*j)R)oYuem91VX}??9mMk_X=0w4|Q5sr6_{n zF1c;DOY06cQwzK6%Na7pf3Bzwi3y z&sx>ysMuUy8o%VL!QsXEQ;y4N`stWbQi0u;x~U)BZlowRWoU;Cy3qyBM4tdqY#*@2TC zIN5=d9r(B2fmf#BbUuM{_e<9q3Nie}&o_@>-RaMpt+9P&_k5;MoLArenRfQ646%5s zy{J6YH9Mc`HkZpMR?{+`>~|NL(elJ<_QcPvemQ^T(p6mM`JMhjBM_foHoJT0AH96( z{FP?M$c;~h@O*N`dhR}+gl__VC^V)LuRzt1l>AMU-w zAk~ZqP1)G>BQg`C-}&<8?XB&$+1WeaZX5QY&awYjyFYVz_n9l3?RL9;NtNN5E0>zb z9znHU-241XXKQ?V&oGb0Ge-t~9RBD2c#TgFb2py&=xAfSQ9Lo)m{%L)Cq7yjW-@y6 zqlJHO6i!7ynag+Hx))A-4c&Ne2~ ze8}-%3tzQS4L`)MPkeNoaXI;Al;0U*lfU!{^L(?}D)s&s`_I*9`{GGfJ$!`k^=s|- z`E{eP;(S$=zn*N&hL6s&XTw*|@);g2Uu^N^#(ebHNf}VqQ=Fdp}rMPkm&=4`zD&r%&!rYx(-loqx%$KKREx~YPGA0GIwU8hYF%HuAEiER;F_8^D*P9q_SQa zX?PdJfs`{vmgosU(U~fVT1kG?81ZGL)`_44`5`htOZg!Q2QtVi(4bOTbjmXGh0rBX zy`%#;o1kp|pnR4wU-;PGZfnj+)|A@5^Z|h{5o;q0kRaE%Td50DG~5O)h~zK21xY9# zm!?8_Nv@JnCaNLG`B_l}6H9%4<07?~fzoNEM2)>sg_a7=Aa#?Yz*poL;4JH(BmsNz z)W^#I^M(C&t#<2RabdzRx8vFgAcrz238#Q-Y?t&rjl2#%mDeC*lxP8MwF~)+6Yt47 z?1fAX+fbsjBmgKq*^N@Xk|91&p_5DnZ40!j*pGTcTw2);cA!zy9uFMXrT^titED}5 zWpnGn-Mh9(E-tAu>@TszecJuH8bt)7evS~I&1{XTg6T@gF6ANokW-Nzh96*JV+mi` zN&qGPBL}rql2dq-L>SwYA<<{ahX5|1XbG2DqgF9u1^>DPVn=*s-}PJ=RE-G>1||ipNY0 zHDs62)GoY_$6!t*ESMRSf3R87)fD9&q!XR?Ds(hZhA~dpYz><%>9a}Z3Sr?(N1~QM?$Tkul*A|ZW7Ey!f4o}i~E>tEJ0s1GERt73Dbc2?(H1q-LS<|rSibjfZiY?06coK{@lQmAv z1rAmC;;H}Sum0s<*k9fC?t?mQ{y`Uoa+ZvuU>F^HBsQ|OGHKg_jQ{&%@MlBJ2irk7Bh@HCy#iHjrC{ z{*~1-O8PigLj6ja3qhz1$S#nPT)3LHY6&Mp4WST(tQJFZS8u-M8*k6{wYwJ%MJ(?F zTfmdu4SGgEWv|bQx3}V-kq9l5b5$#+sZKk!6j}^ap*pjR!#B@T;gHp5BdEWdj@rG6RFODS8YsbY?J$T}K&5u8=V; zY2t|Z#~Lv-C>6m_)k;(+=|PSY6tJAhYOimqe`&Sq<<84nbwzxV>Z1xYk-`)|W0?UD zy-($2cutC#UYSF%<``>{lP*fhBWgsHk{cB{2f>A~Cz|mROAgxMcve1!@Qj~P18K3R zm5L^YN=Ua`7TxWy`U4+ct=g!&m$%pM9g2)5aJh7wu-?M3jUw@(ltFz}Bhtx)d@O0| zE&P5|Ebf4t#APv*sn0-fDa_d3GFqP$o616o5Niq9*j*YakpXQe2=FUB5ziqUtSqGX z&DE+u-n_h3^R`q^Et615D}^S@a=18E5?9I#{FcqMM<~0>I%pjuR`H~q4aJm#1LY4@ z6~Q$Ltf&W_Fmm2Y;by4o^YD$Cj;Z~Mwhf*=u_nG}QAhmw;;Ebd$!)7uKeYYwR;?%7CQYQDaC^I@+1^1Dwaes1#d&J+@gc+ zMC76=DNTw_NFJ-tMSBUJP*xFsM@gxyvRd^A9$2mV%B7dL>M@2N&Ww`Hb>jpWFChkG z*IP%Wbb=!1d_$e4M8_s6vA{i4qoAh<86U0gs5+6$s;HSEkI=tic2}%5JY;^VJhAp z$N{gy^iALNmsZ=obM?C0jV-wOCBX*c9zqt`uO7ODfw?m5F(^r=Aw;N($(W*vBgz^h zzLg}EZ{|cHDGKC?6U!S_Tmo${M=2i&K?d(fDgf`d{c3MEZ866GK0G1UED zJazWB-m+Tx-pkx?6*RV~L`&|{2h++>Dt4#t2Tn#hq$CZIkU5VDRM|g>xKz#LTDUiw z&h!*$N>H;Tzn2R@X{v)!ozOnCgsNb<>fcaE86HxRX)$dbv$=~Qt6j=(`s&J19=~|L z-Ma3Uzht}B2Z)V2JBSsh77@3*PEE-SN;Mf?U=aEGs|XZR-Im$l$z@{jQv4dJyTVi; zPy&kl&jwFtw2fpkaX+LlO1V+lfqbk=;gnC5SrC+vlnx6&^Vk35gN5%s^70lAwMJepPh1Cw;pk&xQk4>^pIh$=sixLWw*Z(5s~Ib^d^<0ap3Ux>p}-IA>E&47V0DQTLj z(xm7{sjvKPGbOB`MJ=>J%RLVO0a0bLf-)I4A-#HqOfgm>7croh;ggm|prt~iuEvc+ zgC1W@wXm+J2S~1_R$@H7`4rGqgIDl@UECPqQ~^v73}TWQ`LRq*&0S5E zBEzAl&=dzS%Doc6Q=oH2h3$0dL^>-vDxpo~BV;AKI1n1GGjA5nx^|ucectwyhkZQR zFS$BJYB_}tRmaFrS2;8avt}mmf#y9N~@%1ED=>mmU|^JTv(;xHVusu zEKT|<3d?1K!z_zd*C6>w;b_E^4RcNvPs6o0 zM8oQJxGA(9#iJ|GN5 zFgd2)1abhSWlX`)`ElcyhvaKmR^M*R6|TvovqC<=o#XYOPzqBze+(76D={=0CRA7? z1f7&b@seNBo&r+!6oO)Yf-8fO$vS3r>PGQe8M>!ul1KUwB|e(R^u3^;blix((oqk~ zbFskXpkA$-uN-XL;R-MH4>s+p8k>b`Gm0pdxAUnEMAF9-z&N5>IU~BG!Ig)iu!tp7 zPNy*SQ-N^G4vq|zi@saQ9Z)s&mWxwor(ck+NeXa4_@DSBCq$Nst71qbi!^{>@N_6# z-}H*Zg>GNoXm%enEF5ioAnV9NxiM9J#o%-kXr>uQcSxv#N2ICnYj}dVy10%Uav_7Z zS4zSVVlyyM@)Bv85G_v+)6zpnq|+z^J|~(o(K+|=P@%o?(*rp+ zoVkUj-EG*z3JO31f$p%H$nWk2<%xq+bfZ0^112jxv}9Ky>KM zit~k@^pMb?COHZAW4-w}pU=wxj~0vL8X%xDFmiBk!r%RkXTN-K+!psIbOR4gy5A*^ zoopcfFX;s`DE?qOu@k@~a6l_6)y5m?JtS_;{N>z8PtQVYEJpNVJX-4OfDyjVwI3rr zog~FWa%t=o_@VhHc8m!Hfhd9aSJHkmHBnMCmmt67&d~_8V~fG*yz$Ee*O-$&Sm@45 zW0VtTMw*|(#L?4op#ZyNAGWVTlKHM0F&` zw2in=R3btTE(JCxgb@~n%$n2$!Rds6P6a`CbC6bi!ObP;# zbZMdaQW&r!!VJbPRALWK3a#lrsX~<_)yM|v>X&$w5x>Ai(B+1&9;B+McL#&95Cm!A zK;|)skGRe{Z~jNWd~BUBy*N-lSO7B#a}nx+ZH4WCq{TEm1Z)a)M_aFX5p8SdNYHcu zGF=gm{qaDKF!~8`JN|f9tfBGKVasbfX4El&>1V-hJ~g9b2X% zn`!ljCaJNArkYBXP`I6ODPQ@ zuig&%ERCgQNWVowUn<_Ev%$iF$yyJY-UyJ7jw$*>2!f_u>oyggp%5S6f7{hjV%=h{R@wV zt^t8C{PF|$tV=*j9u9m+SdcIRGx9m06ZJRNaIDDV^WZTd)T1Y{<-n@3&RU`+PEY=p zMV@`{H{NpnRX);Ry7bW2_9KT*o#K9uLQL^4T^r;1le z`i(cQt#`W7?Cdm;ZES9}m#%h)cS+pf``~^Zb5Z~TD?H>-s3MAm!qc;^07es*CQSqb zCx-OK=)-S#8YyWC`ENaLaD}l8gP>+8uMi(1 z=1%7>CR&d_GKpWH^-tSeij+`_3`pNWoUg`dXTaaFdIT^>GNdp!{)6=xIo()Zy|j|l z#X?2IR0RAOy%_j4g;0UnC7?HllIXP21Wukur!e#!Dm2vSm@aU)wLqPG>b@Eky(*!n z#8k6HGf`?z>EUczIB8;7)9WHga={J4)SJ!N^UfJa0s*_wbtY$NX$YB_PVu-Xa+SL>_RKdal zBNIb`h7V6$a;jc*wyJg+0pPe|tjMgmK&>xcL}BuQNGZQWfR8|A!BFKv3Y3be8mmc*BiwcQS3ax+aFyAb{RF!n=wO$STc&1%HYO7Pe zIap#kY4e_*bb4{pl0Rxnw(k8qDaC*daz0ri8d;Jkiy?)Tqaq{eD%})tN#e^;k(~PB z5LN)4dKm!kbd?QYCdVz-@*3cjd&Sf1wF5 z^&SqyL!zHTCt|dQB_6*pHQ#vj!pP@SDNv^*!GL!t|1pYaGL<(6#f@N#q|op#WIOCh zYAd$Ej`0C{5>kZ~iAWXF9+6yF$$+wh>()<|?qSf}*n^5VUdO0mB@CHmY2_Q1c+-!s zhsJtid-3t3@!Pv#+?KRlq`xO6zzo&^GD2Jf*qL9!)1;0>!;qF~MKRgrA`#x{TL8ZW z)G8OC%~Gg=#Uzv9GvBc#K%Vl=8!7_u1%T8}JK(gl)x{bz1CzM;E&Ubgh$!QF`m&<(0; ztzzhWqVivIogo4N2Jp<)mxl&mOS^e0p+lKU0h5C)`EN8q@^!3*CS#&;G@=@N(jL`$ zxE-0`(x+!H!v&-Ra{08rOw-{%gu168{9g4Zu3}DDFyEV+CUy!AhPV}0 zq?(v8;61+06|qHJd1{yZyp1q9L;Fh9Gm@cT@K~YBXtq&{lS`*4%B>FCZx<1miFjJP zl8*Y=w0<)FZ0Ak?{2Sl3cJ#9qqw&)GN8Jq1#dV_aRWad0ElM^b4W^L_AZr~P01B2x z1meeY$*wTJr72NJLYtFxYZ&BkH2jI7VQhqKV|4OPGSY82fyJW7g?Y#=;Ek_U7GG(* zZ~3ufm}q~sFUf)!;egshLqJqPaT+9Wc~jop1yYVp&Cri#(Yhyw>R@oO3ukHkAwzHM zaX6us%(-SOciM2hD$2c0QCmT@6+a~6GEqhTaW!i#0eolXo@cpXt7(5 zfrT4F_?cH7U*ej3=h=9&^h(NRl_8aaxnvDyra|eLn%fAJA7qVQ33oe?XxyU|vqgOq#o}bM&j%T_- zwju500fI)DW~`_C6ECT&5*kwrf~IYPmfuv-W$m)`fm<>12Ir6_K2;hN6JZeW36Du3 z6V(YXQkuZD=&s{ihi*>Cg#^^J5=v)iiMZ*z)_vw|V zu_2<_f^7=-7@c^cGf%IlJ@8{_07g3BKkx@l1h4m9u6l-uD8d{Sds(tI?qjgF=;VZZ?ZU+KEQ7V0*pwJK^ zMV5HuPp@B=`EkU?y`*(qH74)&vl4Dd;SAz8#sNVE7O`;KF;Fh)q;|F`3R6iaCXr`k z5Dzs0LO=^=Dtovoo`z_U3IT_s$JKd+JJ#7oV>^cNwQ0$_(NU|g{dbQq@)!z2!7ABG z@QE|v3m?rd)BN%mqC&<5V603w;H=q!Gy(HRB#XZwjBs^WFc~T`(vRmIfGTO3<;(wH zm7xtBR|?SP;3ZWA1zRfw#ag{vB&_GLy}FBB53pqGkUv`PI}GxH1gcS=P3c}mrkXe^oVkV ztDy%S_;qxNuFb1`w}UO#*0Z@MrM0 zO0W&$kD_76V$ccF#fHJa)ycGRvub_G-Q^Fe%tiz$nyx6{Gk<-}_hfZP6IzZeZX_A2 zmQD~9h641e|(8+3GGZFm({8Q8g1sax{B?lGuX&Tt^K4( zZ&9U$KVqdUJ5zJGXbv8XTyqa|>F85NTfpUW;2w)tp5*P6Nl;X;c~jmTL- z67r2Ge6Hgj?cy5ZNhLY;MCl&4=uS%o{GZ1U>=9v%lu#SBMQY3%$(5UI3*jSfg)TKWgU_Psu{YTANb41@5gG5C>`g0nSiBQXXEsb|NBNTXwN>J7@pL^|aeEubXz~BKj!hw^aTeFy)roK5r*W99|2ZDK;3b$O{k{ zxyw<1!PXd4#Wge)C#%7iaD^^F9ScTc1H}B2bUBVlO4~We{7Eyzv$=)*0a=MUOLp`P zzkB@Hj|H3rWAu+OKw%y%3G#(?W{`fK57Rp>aWOf^KN)Rf`U7qekqdn&wNN&q0m8F; zGF28?qWf+{A!`TJQ3^bVcqMNO#3!y|*7!-W%@d6W+r0VjtW*5i&{ec~Da8-BLa1cR z0$HXAn)Ox!H}X9|H6vG~Gm3h{0Gn2HqE<2BfZZAvnwl>;26=;8I@Mre6P|{CLdwOr z5x}}?yuAOw*G5Utc;$EmRFpGFr^SHF&;HqUmtGvWbjT492k&)%2yJ9$B&mctB;|fV zxCx2CEgdtrk|az-#%)m8VLAAJ;4l+Z(AWA#TLR!x zib+(W)*HL`0}%TCb$?l`!%5&@AjpIoC_Y66ZbZz8u|{iVQ6PDg1euH?+OjlNnfxJt(MY63t)dG`MhE7%k#7(xVZ;KK-IEJG}d74Z|pI^V;#m2GgjRxV6DPA>h@q=m$4qHu${08s^%ZP4)TQeARVjy)T z8G;`cTVsg$jd13I94GF`tb?>-_=nG}al)8c*|&-ss>gXtHAJ>(F5yZuf!)h`DB+xa z{qe1Qq;DQl5IwjyVu&b^;a)VBO4ZV?=!%&tsz>zHTcUJHtO{E3H5dWP0_+$rKv4F3 z3US>{@)N%#!K zbCh{Nng<3dQI}@FVt%rV-|_qFZl^q+Ym;KiJX5Dcl*3)z-@qkMG#l{A zk7%BZ*!s@?Ocf8k5~w4U9kY zEyovmoIQ&)6JzXW$Ybi%EHVQRw8m2jDM@OOUotVYHgIDAkT{fx0=j43GHsBn88U%j zH$!qg2j>NIa+U6%eIdc)C;L+}+PekgSyaH1o zzG>ohSt4R5OBZ|b;gTbm#7!cEWG~Ld{CaNR%>|L@A7tuqyMmM~G~Xyy<{hORvZHh% z#4P{*O>4rxvbwJD4=Y@_<$|EtmvT_Fr0EPmf+MTABkdxhwc;xjj5y$p(g}|7z)3|( zpE>ukoiufM2wAy=TanigWK|P7-xScCJ+TQy3J22m5G@P&DFI}mH~!eVAFmF4Btjwb zUnxHdEHkH~7@ebM6@Zgt8!x1qBUOz4QxufTt3Kp%i7~22sT2bVN*eS_YFsKyU^Z$E z>7Hbr84bfjhw?+lkQsM|@6UK4UTi#Mvp4?Qx{s{ZeIyT~FpwT0l0iCo1yFZXf&-2! zG)XyWs&%NjB~E)7B8q#4b<(KAfo2#S+`+dh@VT%?40=w@FC13rxpYXRnJbezG1Tdn zG5*b=xIfHf2!zK0WVP-ilc}VgGn`19iBGBZL=b~r;$Hx5Vn5JE4I54n?bMs>vkRjj zBfZc~z@56>$Xr*6Ajp_Y1v>~&Qw;VTCCFNpBZ&lrENDe?0m?%mlAmFTuX^iREwLP5 zS8^c(CEJe}O$n0kfm@LzI2TULk5p3Uc%@u&twEduYG{68Z>TX&#fd32a_p4ssdxhO z>JSl6#($?!CD}rXL`!EJHr<#Z@kTw9b-SA;SH&7{dF%SM8DH<(NGZ*h0??dD#)=_l zT_5nlpaKU2xmXZ(4~C9b%}yow(5VSCZjPC+I?=!}>?sWI)e-n0TZPt0lUX$E%o|aO zM<7+^l>m7@gQf?{BQVKA&-|C`*JgZhZ6w8k1xyYJPZ%YVaol=8{0^(6NGZWZQHnRo zEHX*>PyC7BoeEj`E^Q{Y7^LQvXn;Ku+0{#qX6(Nm~# z{7I}N(#%YB=HoEUXeeV30Z)Z2fpf_6VMOI9jW?u%5(Dm?(hYKt&kCwG%zNq?zWy=5=D?LW3abzTEK?&dG(8 z&bSn;ZA5l93vPE9xe+qA^bbUP;(8dvXzYXHrrG>*9$h%)YS!&7$C#?|^_i+LG*qp4 zc5T2iWCRMKG>{hYfZ`qas7|TwF9f6e70IZXkQV$Yu2j~Gl%U_lKJn0n3UVei2nP;_ zM+1rFN(q#_kt9@gT!a-Kp}5$l1LIYY$vIajf$jwNB@g8* z6Wi15kHu6&6?+C`B;*W`(c_VJGEnjj7sKY~O&=(sxFLfwLmAj^X&3J)8;N{4O7&=1 zR%*mEe`VcOUbnRXn8p#a8$7mrK_pS#%(PAN39thqNHm6jdGWAfDVq5aWN?^_6#rAG z!&PSpdq_0dYMdkw54B+d;Nv)_q07U!GGfIsu1}6B@m-ncYyR(bS2;Owl^A-^Pc8$$ zrhlBUM*x%P7{~yjLorB0M145@b>i^*qoiIw7!ADSsG( z8_`I}cBYC@4sXi7)GFla`*vBcU-8Mt^3ry*R~$-D9fYewY@!B9;-lk=X-OMXGKmt% zjSSw(yA6!%Nk;%qOMM}lK-Q(ss^d;OV5lDg<;=q|<-jljphOtMSa^I;Q;Y)gaTtzB zjTRW99)qb8Za#SPx!K$P8u7 zPBpbCNrYqo$Dhj{@l^_%(ecT-%^|01L}w#kF~(Ua@{n)vSq>)>R_=Ux-NM6U9R~$4 zA`)_AvE6)iVwbvNs5?MV2uxuqB77JJ+Yb}r`ZL}j?<`WFnaX)^nld1%A$^4ileSsj zQj?2o7DgdLZ%iNR4=7TdNFh;Lf%O>f^;*85OeV!E!by_hG0D!OD*A~P!-jsqSJ zT`^y^g)#yZ4kzzoszrsN!a^lZTSHo+=SF^mGWy^QU`6ez%Rx(uEQ(a_HhzL^3blgf zlvAP}Qo>L=&x;&XwhUt#4*Si&a@-`3mmY9G(mL^!_r?>*`B0D;Jfx2*M2c)wP@kJKYvlZXd;h-)m;esTDL-GRrfG{f?lXu%_yr972JK=Id&-qFu`!5a}*!tZ=$HSoH z>ka_pNnnAvfNUg3ydp&x%Sz+w&>WO$NKsjV!0wCQ1@}{z4$(FU3+G^Wr0sxt>aQ}Z zJR+#1%9Mmle#z^*NXlhc8mW}|(X8M8y?E-z2Y&R(;tu@{oTYC4KgDun7FZ))NXB?)j6R5yNFb9?n4+3t| zHAPv!>MB0_kBl^G;AGdTAeuTuls2+@l$1 zj2JU1E1#9YRBnj5Ja}=3FM&f1<5V&tX9#=(J{AUMmV4nkq)oO|wRRv^Zh7mGAUG`a z8ky@B=$%!lRC#DJ)v;zv+NYT5i8QH>GU`$F_9DG}QWC=mm^O~Z>r*0PN7QGYjWV-y zR9*m`SjiNGqKn8jiZ&jfG=|lLst%$~gMuTGnW?Mfdse)_nIjl&Sn6JX*;Li$u!|}A z9>Ph@4>v>q9U>*89a$A=cFq*tmYd=>YoZFVr$T5T9^^4bj)EJUJO8Bp7=m*jIE7Sy zcz(c7QzcKCjztnghGL#QWFgM+6ny=1@R;}inUr2WT<*1Sj)tSEAWI0%nfFR$>JmGb zfXc7|MWs6Ruc$F--xEPGVu*RtcwQFuiZjIl>KuikT%HKV@Vac76^pg#BH0H5o54{3 zD&;Y;Ot-;=;Usd0UOaW{4S)4|Te_Kxw70T?!yXdwUv-d(JbFZWK1YpB9hh?zih_06 z3u!`FU+gYQi=3Z-jkl0iV5>bMycQ9eC?g3CYsxN3YeaF`97ikeyQq*S#sG#@9cQrY zN?C94^Z)YTIvsB5OIkAiWQ@cZBGTUOYPcvP7)E$rJAO$YpcY*{>P0ajubFZ}Kw5g! z6(giGQcNtaN&;p>J}JKY6|zzSP;*kj7~b^^A;WZFz1AL_C$mbz2sq*CQUX@fLjxl$ zm1i)DP^WZq2<$g52CR8FEc)QKyW^sad~q0d1iHzdq<=&$tPW4a87R0>3pi)t6rqmE z5o8g&28^hbtG6Ug%=8bghR&TcKuTulnbb#)k8zXzMsx`!aRq|8iA~0((W1<?Wap(K*y>nyl(Y>LKNh%RZ3JFRED|p8a|ByPo#3Ao85g^1y_?!V{OrnaL zv`Vcrsy29BqA#(#wrkH!lHfKX>gE=sdhWAxAK*xZ8dD|DoOq7+-9Pc`Cz2E%@ zU%Kz&=1%uPW4j-F|F##r_V*?6xwb@HXRZg%HQFn8QzDVFQ#5GU4CkBu6ggz9Jf#bS zZ-L(XwAzj1uDX9 z$vF>%jRB!BY#>`+kR#&O1J!qS^f)8n-sffw`{9w-8#7~(se8jmS(vc>q$*Q($B;n>|2pV@~6e=MI3w@$o zCa{KL+MjRmpZ&cT23Yg4i(YQMiojVK4F+m6BdCN6w4Al@9lV(l5K_Sf$bd>pdO*Y; zEUuAC)&q-+rhI0^PqJklA&3e&lpvy>Eykqp-jrKpQuI1eG$i~O^l)BL8)$N z=3Dlk-*3S`(uqGTPL>At4voWdNemWkgw8$*Grg2RhiT2n8$N;1Ay1YjqL7ufgAH)0 zQXi7r#D^$#?U<4VGQ|d`36`ug?{AblLfJx)5ma&rL_3%0bXFw&58w0bu~qp}DY4#3 zg$9jdgn$?bCIo96@j;&=5c?P*lqOK&ly(&*h$Tdu$pXw5)gqY;B?3mu8w^-x9Z)Mk z`l_IkRrH8Os2YX&BVs^1XHu9=cQivJJAL~<{Cs=S3nxB?plwZ39s+GPEgYt*-H=?S z_Des3yh&sbAXHGqGssOa$zrila6lTJNE47I!_1;=234G*dL|RVT54Rw`=eM!`fp<* zBxj~CXgF2kOroNnKq7$h8LIyO$8S7m%EvB-`(RnlTEB_pkklP5;uurGQ`b-tAaOy< z3X58|BJ-Ejt6(Z`_)A(%kyQF>waN-A?`Z|rvurjEQdDgP26Z2ir0^rl#DbDm!Key0 zA#igC2+$J5?)h!6cHi3F-hYE#b_*LWdldIj^~eJdLQbZ&2Dh16$SKa-JN=7MRjQuA zLoTwkMD7R`;R#a_P?KD}BbhEj-b&$te;TH1stw?g4EUz!z(7Rl2!^LnP-7^*o8nAofMuy$qatu-uN|?4GI})tNx7jT?ur?&$c^{UD?|{SXFF4tvW&E zG;=0}A?g)ZaIy+;>Q4AkG{2wYvu8924l~6Jz3VbqLk0{7#~5n(uxpv<4SnJmC^pj4 z1(+J-7Ky1@=yp~Ttqm0UC>u^v&?RSk@zf3f#pP$Z2X~s)RJfcXWg+sG-VxamsVpQ+ zBpWR0a%yFvlT$uY{{m`l5q>D*Pm50-UWrDnr!e5rdC1W-@`IL}CZ$(dRXz_*sE`tF z%hU|@EMA!tq$2^FFnFsGfZg;Bwg_PUk zf%$g+p8B0Y!26#=2pZ&|j7YhU`$~0+)FnkV7nhx)+)_7972SMRIW5EtxaHQeHouy% z;hgM(f`Jeq4UC~R|Lm!5>(Imyhzv{IvkJu(Z>{Am-7l36opgX@V88N^_v5K-7%U?k zXrFW~cy5{^a9+I?>*nxq8Fo?0%Fd)NVWDC}hB2ZL)&4?h%PS+{Mu_3F@o`zw-}ugF zyY0)({`h)P5@wL>Rit)wd|lY9%n|YF zd7-Hj(*4ILgi?ZCjbVAGk>SZ=VYr}VZ_}SH4?+*>%{@^+w zdT&SY0lMfZg}EikK$K-l1bn+i(=g1V zc=t!4W9+y404*TY+-YSJ*CIV4*{fgumM52or$-GKi5=}D#2>LJ^iD;pbHT+knVqT; z@V6fOX^NZDKc`CIidas^KMGj3401#&f$?X{9#A=1$x9ETyv*KUOKGpoE+(bHcZv?! zGR{?Y7Q$H}>Be7tZvO>F2U~@YmJ-IuC#WGg4mX;bXkfzMcuHyG}b_yDal$nB&2fPmUU?Su|-u`A}Z{rrl7PwIW8q1`-7bY15Gf}78Y^5ZZIt{QQQPL2;nP;xfJar{SKHpHcgoWuD4uif4p zd7FIpif2@xPy`ad1nhLKr6w{o62eQ6Jnr6g#h_5JQM~CE^Ctq0OPpFY-rFe=3SmI( zGg8|$9mq$0&;$!Tx|zxp5hFy#w<`{!kuz+_lwBJcAMu7KKfAfLd!=u$DGRbN`fc4e zo|!A>$3j7*&_l*cS?d!?`2|kaPHN$iVa=#?qmoce(_xYxQZ8Sdl4U3!IMv8A+!?CU zOxsdAWTXyIJq|?DyP=4WURUL1as&1n-S?%#g&n@}Bji<O3o!> z;}qrJfZs-~!tg_@ilMEL=W7sDxrGkV7^_q5;DXBPa7R zblV^g!`^4|toK8!1?WH4q2;)7+Uz`|W2BWz)HH$Ikh&9hq!I(IE0e|$Go3`N;*N5r zf90oB*>JhmVz%njU;#L#)MNJ05>xs*aM&H>-mrQ_G*iArY03cNqOMZ@N znV2zk4*;JH24)FX+`i1%u4~e;FPXC|Yr)ugcIT?>$8-kB`ZHg8a{KT$%0%ICvDXix zJW82br!g`Sqh>p}L&=^RqK-=CSoIlr0i^|?3ytCU(pw=g2{I_R$oRCxxQ*bvH<8I+ zA^p$4s;(@ErTzEn|R+AUG=)_C|m84nCB`+)SpfFFAwv?t^kWpxv zO{1Pl=-kONXl0B{ubE z|J&!U^gGMrYyb^)6p2^?GczEV=&X4k%TQw`8q5rP)*savfI|+T@zib7Bc9+A?%veK zWI4PUN2ggW#0th#F_d^hy(kJP2+)a&>%;HUvE*n0@ByU$g*QKUJf&4f5 zpeh0q7E-quhJ);II*O%IWk%1|ECv+CS4474mgU>YU{Kt`Qy6U^4q(tlkRF3H04f&B zOEMzH9Z$<=I_NXeQfAM}2Ip}4*{^)&%GIsMTJP&SI7+1|1rvopYH43Ca|K8&P}&B> zgXAX9_#qk2n4p70Q87!Y&DKbd=qwckgW6#q-XgG1P7NfAKgx;8B&8%0Ut%Bhar0B}$h(P|+v9S~F)skZx6)OVKl z@BEXeKXG-lJ=iXb&zz#@gV?|FjZarSN-kF#o z*sQ?c_%P5Q^ZTNi*SHtOs%EYsE5?rTt%LVSM*>IBttexNdh$^o-mcTc;EOU1%m!y@ z9|h!ae(yQ=)NbD#9G}a}*9djATj_@!s%@Yq7S*AvWs^+0s8I)?EhN!S)=xIKL5~%t zMe!rrn!H=bPZN*OVk#zS_!vg8aDT>9=zgVma^opVGTeb~GX;EQi~#Ar0C_`_pKIwJI?ku)CwWLK;a|HF~uf#Y;VUfU9|-UwpUmP5ryaGS^g z#vgHr=Ys?@uQO0=|Fv4DKk|KFSh_IXSzGu?Aqyt;UFsYWb4?-QfNNh36CrTl14d{|56IunY zOSM*D^_KtZ>Ad*$z`kr%d`m_xIB>?w`(clm3e5rlK}gRI03;TVSSS(B*=F85?D2=6U4{L&;RrvJiE7fx!*a& zH|cH#HixM~@n0;%eAkxy&Iv!W!9gxZquXf^$YBS%)?dG(;n z+z>D{Tv|0q+}Q)!ySf4}Hvrny8XSlaKG^+t-ul$urNbrRO1We-2;l?qsxuI@>3uK> z!;HPi(pelgq=*6ONM?!XnIsXOem%UBGQOCgX@C)k$$V7xPB{VTmFUit#t zrFnzOR~1&fk)EUsRm%@!@M#U z1tBm^H;h(UDFFy5%m_^8CyQ6W79R)`ntA|c3xoV~I{1y`AyCbBU3l@St2>AOJrk@2 zg$xhjcI5`Hahl4Vo0QaJg-s=M#c3GsfOSWXLb2)@u9|((o`Keutx4$RxdII>4y=T^JY$q%Bz1QCu%CxgeZ{Aq;X1yU9<#XbTe$`c$4HZ(4p z!$!~9>H*Hk_HTIf$%j|tCUbPUG6ed@{Sxk32gg~nXI_WUw|x&*M$yL3p53&rbQ0OE*QO3!#1cZBxnmkR5i#f)eO%BUT_$aR2|2x z*M{S3Rmk!#flNC?KiF-Q3C9=b#hJ1~tkR%b`Nxkx{YbOBd2n*RDy#|>99Glb*+Q_f(xbKm{xFRTPqAKSYq7Iuf;N@_)1gc8t4BtOWTMa+L-T7F)9ih0_! zli}K7VF`nDUJ4v-4`9b%^HFKQPi2b}j+RStL%eok#GeGc0YSnk0w!%3^kR`_2oM>V zOAC|h_xRs@`tj(dt}zZ7ffb&>8M7AE3PF^YBye-XBn9$gRJA!__>Ppf!c&o(3)h(( zm)o7;mzlN{!^B1y&&%7o1sVM%{|V?<7z^{oEX8G1YE(24|FXZVseRMuSEb?$iPHP; zMHo_7@Qmk>HY2cQ>)0nNVCNCJnc;6*0l@07DLiEJP**$_fe9)w!=y4A!hs=O<&^eF z!(PgLk_o0R^LFBphP%fGDLRLtiQ&ES>cX_{WO1*$^_Sc2%QDx^#U{Y@*oA8yD~IQb z(Q|qEJu!_jgwDW^$OAYEtOj-g(FOP9xNtF%=_8&)rEXVHMCvi0CQb4@qeKA0R(}Dx#8O}EKG;&SPm7zYWBNAoBW%A6N zvTMcNv1(_`cF_r=!R_Dk=nKp1EKi<*o{>M~6;&z$A)+#SAw$cs^f(4(YBxogQD_P6 zCLE!9^MW?nh_aEtKrbdY8=46ydKfa-!eJW5>`qAF!m_iJvsa%FFgcdUiD`P!OsLp$7;3zUqH-l11a80Ku^(nNL zqBh1rXI*A@p(>?f0~G<5RJ*?7LIpqv26WN*=s2gWCBt>U`;`vY~7l_z5A3eCb zp*OT8au%{hl^o0nI#e)0CxMO`I;wKaEvMnav@=b&^oza@6QQ2yGG)e;$R5wkgtJx4Krnx*yHhBd`#zW}%QT~vdxdeHI1(2j=H$y$tw)_WG zr}CIQ1et-_$oqrRs?D_zZ}0r-uYWPVH|gz5k5o&CK5kt^Eoew8X+NYVT18qj9XaF-@zb)GaSMB((y~~fwU|E?%44o&GxVWxL8Wg>C$VNj>n2jNUvb7#h7;`!Z zTsgP!uXqZ9gec-jqj^+&_5|dsE>T8Ia)U$<24~9`2GIRyzVQ71@~Bl0ZbSxSNAiLG zz{iAr#KzoUL!AVNo_cTtE757D`Qf2XHB|k#6U&`3KI>pKzN^i(Y!W99mmPM zpi2nC1=BkLIjPJbCGsK~94tCpVuT!o1q1eO?u+0%+Kh@V)enn;iogOEsv zh_y^frJ}kjXt;VeEfQq-Pa!n#0QUn1+;Zk0y|7y6=2q7q2^tv(X=%|sKZ`}putFuI!&Ll?X))nnA}|^pQptu6R})XekQ%t zKw{=l*j)0hfspyy8~@i~Y4wHmr9r#|69P9ziRB4M5*^18vv(R90mjxiSRb7Z~Xn| zlL}rKq}vC6C6E$*oXT}FKifh;r%5-H7gad*sxmtG$42HQ1)L481V!Ky{^Cy zrB6){5uVkpB+yImtgMxm0|B5MBIXbRlEP;wB50<`%K#)3spLUuSQ%wJ&{f1s+qw;w&XcK05JCQd&6l(K)fGi7 zWp+b|u}lNNz5)8`av9%gDj*;`_~;w|+Lw;5@3QL~Ad`-A>sw$l7fwDgTV8{6&#SGerOsB(F@_n$2+=V10jn3((Q0E%X_@<|S<>(5@ zm-s67HIu(t9oZ2+mnavaN6QK2Fev(*Z$a|qRg)w;t~l|WHh|&P7C<5d#gD0Q zL4_(A#KCeEw4SGNLDHki!^#ZMC*kiLLsX&({i>*vEfrEV)4^Zga?_WOuCw1l0AG96 z%s{MU>Q2rXj#Atc;WLkxzv3yR)*4NR;Y5OWFaq~0l?0Z60#4X%PGV^Q65zu85N{G1 zO%eKxQoRJ`({~dFklfBBO`er!lMg2ogxQOMfI9sT)=v8vk?8TbpU7@JwQ7m<*BdDO zcbF;4S-q#~`FWFCUTVd+6Eq--z$t1vbqrU4g@(1$oeST(`Z__P|4`|{MFI>+2q}aF zj>yWr!&0hS!jUSas~7LR`fXo4x{J$xuRW~fW_E}`PLTu-ay*I8TnVz6Qh<|yq!UFl z)L6}0Xye)Qaz|kg%mwwSdNPMSZ@WU(5QJvn8tFs2wiLuYe6*60cXH#>UkU>otgQzR zPnsH+^XlLDrK1a6HCkQn_YTW83RJv4`57fL$|Ah6;v`~9{Z{UVD^zl$|D-2`w4|h} zema~fJxK+>a+5qq{AM z3P6(M0XQ;%$UAP*q>NZ2CFE^UN%%h;83|^jZBdQLu5#u#{s+H&bT?DU-`=_0Y_*3~ zF*RxAH6ND&APQS~M@^7Yz$4_2pw9abP=-hYRgA!ZqzqtR-aC^SIuv@*khx}Dj2eb- zmv1@TRqqjw4pRaL;{;@Y$RvJB#Io|Rlv(D@|NC0B*`-Np9z0wk!azh|I!KoxfkYBW zdCW`^$J|4CxXcAMb*U_l%z~;-H8c%?>{xf8@W%k)U~!7@Qlh8A6lHqAjb>?7Y~H|| zcF`2mXmSGG;SM>`VzA2_zJ6?pDdHWHNGV7FfNrS^?S$oHu!_T!s;2^=ur4d*=H2p? zyc8Vio=j|Iu9P%h{pRvzn3(F=0D7W6=GY-OWq2!*uNc!n5g@+1M)JzMFwP^R;WUh7 z7r(t)^O47DQv#~#2owgSQz-@j2vT~qhdUB&1QZGT2!tG>;U@9~FO9?MdWwu*8yaG* zJLDpK1LLxg7!BZS!-;$;*i#S%G$n2zoiU)PXk?`l)xnFO{pO!LYK}*%92v#M<)~%I zOT*h`ifAx4k&~X|%x?GDLNHd3Mwm`T!fq%~BnkX!DCjUyDr7FLolLfnjM=mlg%Zvu zgTd%qBNLDK$gPrrQv~v`5n&9s<=i*EXO$7G^O^h8mYTfR>;UnScTrwtEi*2lM^5)Q;wIb@aicMhNv*$jW@?kB)j5DrPSJZ zhR(_wU{5W44+A p27mP0bMdSv|D5c=$qt Date: Sat, 9 May 2026 11:40:12 +0200 Subject: [PATCH 0275/1079] fetchPnpmDeps: use writableTmpDirAsHomeHook Signed-off-by: Sefa Eyeoglu --- pkgs/build-support/node/fetch-pnpm-deps/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index 80b637b57ddf..bba11ef60560 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -87,6 +87,7 @@ in moreutils pnpm # from args pnpm-fixup-state-db' + writableTmpDirAsHomeHook yq zstd ] @@ -104,8 +105,6 @@ in exit 1 fi - export HOME=$(mktemp -d) - # For fetcherVersion < 3, the pnpm store files are placed directly into $out. # For fetcherVersion >= 3, it is bundled into a compressed tarball within $out, # without distributing the uncompressed store files. From 83ace87bc75eac42d93463c6cc2bac18336fc9d3 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 9 May 2026 11:41:40 +0200 Subject: [PATCH 0276/1079] fetchPnpmDeps,pnpmConfigHook: add support for pnpm 11 pnpm 11 does not support configuring some options through its new global config format. As a workaround, we can define these environment variables instead. This also adds support for the new pmOnFail option in pnpm 11 that replaces managePackageManagerVersions. Signed-off-by: Sefa Eyeoglu --- .../node/fetch-pnpm-deps/default.nix | 35 +++++++++++++------ .../node/fetch-pnpm-deps/pnpm-config-hook.sh | 22 +++++++++--- 2 files changed, 42 insertions(+), 15 deletions(-) diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index bba11ef60560..79dcddbb4a81 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -99,6 +99,11 @@ in installPhase = '' runHook preInstall + versionAtLeast () { + local cur_version=$1 min_version=$2 + printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC + } + lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" @@ -115,19 +120,29 @@ in storePath=$out fi - # If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs, - # any pnpm command would fail in that directory, the following disables this - pushd .. - pnpm config set manage-package-manager-versions false + pushd "$HOME" + pnpmVersion=$(pnpm --version) + + if versionAtLeast "$pnpmVersion" "11"; then + # pnpm 11 uses a different mechanism to manage package manager versions + export pnpm_config_pm_on_fail=ignore + + # Some packages produce platform dependent outputs. We do not want to cache those in the global store + export pnpm_config_side_effects_cache false + + export pnpm_config_update_notifier false + else + pnpm config set manage-package-manager-versions false + pnpm config set side-effects-cache false + pnpm config set update-notifier false + fi popd pnpm config set store-dir $storePath - # Some packages produce platform dependent outputs. We do not want to cache those in the global store - pnpm config set side-effects-cache false - # As we pin pnpm versions, we don't really care about updates - pnpm config set update-notifier false + # Run any additional pnpm configuration commands that users provide. ${prePnpmInstall} + # pnpm is going to warn us about using --force # --force allows us to fetch all dependencies including ones that aren't meant for our host platform pnpm install \ @@ -150,7 +165,7 @@ in runHook preFixup # Remove timestamp and sort the json files - rm -rf $storePath/{v3,v10}/tmp + rm -rf $storePath/{v3,v10,v11}/tmp for f in $(find $storePath -name "*.json"); do jq --sort-keys "del(.. | .checkedAt?)" $f | sponge $f done @@ -161,7 +176,7 @@ in # This folder contains symlinks to /build/source which we don't need # since https://github.com/pnpm/pnpm/releases/tag/v10.27.0 - rm -rf $storePath/{v3,v10}/projects + rm -rf $storePath/{v3,v10,v11}/projects # Ensure consistent permissions # NOTE: For reasons not yet fully understood, pnpm might create files with diff --git a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh index 2590de95343a..f9c19341d00b 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh +++ b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh @@ -1,5 +1,10 @@ # shellcheck shell=bash +versionAtLeast () { + local cur_version=$1 min_version=$2 + printf "%s\0%s" "$min_version" "$cur_version" | sort -zVC +} + pnpmConfigHook() { echo "Executing pnpmConfigHook" @@ -17,13 +22,18 @@ pnpmConfigHook() { exit 1 fi - # If the packageManager field in package.json is set to a different pnpm version than what is in nixpkgs, - # any pnpm command would fail in that directory, the following disables this - pushd $HOME - pnpm config set manage-package-manager-versions false + pushd "$HOME" + pnpmVersion=$(pnpm --version) + + if versionAtLeast "$pnpmVersion" "11"; then + # pnpm 11 uses a different mechanism to manage package manager versions + export pnpm_config_pm_on_fail=ignore + else + pnpm config set manage-package-manager-versions false + fi popd - echo "Found 'pnpm' with version '$(pnpm --version)'" + echo "Found 'pnpm' with version '$pnpmVersion'" fetcherVersion=$(cat "${pnpmDeps}/.fetcher-version" || echo 1) @@ -33,7 +43,9 @@ pnpmConfigHook() { export STORE_PATH=$(mktemp -d) export npm_config_arch="@npmArch@" + export pnpm_config_arch="@npmArch@" export npm_config_platform="@npmPlatform@" + export pnpm_config_platform="@npmPlatform@" if [[ $fetcherVersion -ge 3 ]]; then tar --zstd -xf "$pnpmDeps/pnpm-store.tar.zst" -C "$STORE_PATH" From 2b1412dcb732b5f1b60a1fef3c4c9c641ee0c6a4 Mon Sep 17 00:00:00 2001 From: vimlinuz Date: Mon, 11 May 2026 22:12:41 +0545 Subject: [PATCH 0277/1079] nightdiamond-cursors: 0-unstable-2025-09-23 -> 0-unstable-2026-05-11 --- pkgs/by-name/ni/nightdiamond-cursors/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nightdiamond-cursors/package.nix b/pkgs/by-name/ni/nightdiamond-cursors/package.nix index 708d0077b5be..86b2d888498a 100644 --- a/pkgs/by-name/ni/nightdiamond-cursors/package.nix +++ b/pkgs/by-name/ni/nightdiamond-cursors/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "nightdiamond-cursors"; - version = "0-unstable-2025-09-23"; + version = "0-unstable-2026-05-11"; src = fetchFromGitHub { owner = "vimlinuz"; repo = "NightDiamond-cursors"; - rev = "3ff3c0486430a4901b4d5cbbee87a370aa2b8ce9"; - hash = "sha256-huruHo5w7Qrte1+nIiz+P1xPNDGrv5/eByHwaSlZYwQ="; + rev = "49650765c3396ccee9ffb796608845d4660d5692"; + hash = "sha256-Ue6dDvNMq1pGfzudt1O8h0pawfKj4FskTGLnpyEp0CM="; }; installPhase = '' From 13ea07d7d82d5b0ec7375041820a3c43f402717f Mon Sep 17 00:00:00 2001 From: Harinn Date: Mon, 11 May 2026 23:16:08 +0700 Subject: [PATCH 0278/1079] python3Packages.hebg: disable test_exec_codegen --- pkgs/development/python-modules/hebg/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/hebg/default.nix b/pkgs/development/python-modules/hebg/default.nix index 5bf209fe7a7b..01cca8dd7dec 100644 --- a/pkgs/development/python-modules/hebg/default.nix +++ b/pkgs/development/python-modules/hebg/default.nix @@ -44,6 +44,12 @@ buildPythonPackage rec { pytest-mock ]; env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { MPLBACKEND = "Agg"; }; + + disabledTests = [ + # exec()'d class no longer leaks into locals() under PEP 667 + "test_exec_codegen" + ]; + pythonImportsCheck = [ "hebg" ]; meta = { From e4f606afe9bce6bbf080980e06639e31931aad0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 16:59:45 +0000 Subject: [PATCH 0279/1079] level-zero: 1.28.2 -> 1.28.5 --- 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 4263a0d3aab4..9d6348f5db81 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "level-zero"; - version = "1.28.2"; + version = "1.28.5"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; tag = "v${finalAttrs.version}"; - hash = "sha256-I/MdWljshkEh7p/3exkC75x1hGgeFIlNySiIN+n19dA="; + hash = "sha256-g97BgCR/ca9Xv2l3Kbyuez8vWY6Jwrwt6Dmw3DGhPaY="; }; nativeBuildInputs = [ From da48a72e27c4e7604f6e826ae5b4bc2f3c9abd2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 11 May 2026 10:05:32 -0700 Subject: [PATCH 0280/1079] python3Packages.qh3: 1.8.0 -> 1.8.1 Diff: https://github.com/jawah/qh3/compare/v1.8.0...v1.8.1 Changelog: https://github.com/jawah/qh3/blob/v1.8.1/CHANGELOG.rst --- pkgs/development/python-modules/qh3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qh3/default.nix b/pkgs/development/python-modules/qh3/default.nix index 24757a511d88..bc299a4b42a9 100644 --- a/pkgs/development/python-modules/qh3/default.nix +++ b/pkgs/development/python-modules/qh3/default.nix @@ -14,19 +14,19 @@ buildPythonPackage rec { pname = "qh3"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "qh3"; tag = "v${version}"; - hash = "sha256-aXFevAz5B58ZnK/LImULpETQNNyRKH9vY1CoGh5mKxI="; + hash = "sha256-/N0cVm5IHijShv0/q83useJRP5/N3+9L1vtrm7Y9vp8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-+J2MDFbynUWgyLcGYRMIvo0PW6Hy8+ka2H6HMaBIOl8="; + hash = "sha256-7SbN8uj+TPoAhIwXqhqCGqWGpg9sYob95TYAHixIVkM="; }; nativeBuildInputs = [ From a2bdebd7d0bf5875c2d8044041477a013b35d729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 11 May 2026 10:05:07 -0700 Subject: [PATCH 0281/1079] python3Packages.urllib3-future: 2.19.913 -> 2.20.902 Diff: https://github.com/jawah/urllib3.future/compare/2.19.913...2.20.902 Changelog: https://github.com/jawah/urllib3.future/blob/2.20.902/CHANGES.rst --- pkgs/development/python-modules/urllib3-future/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix index ec46491b574f..58db72ef3cb0 100644 --- a/pkgs/development/python-modules/urllib3-future/default.nix +++ b/pkgs/development/python-modules/urllib3-future/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "urllib3-future"; - version = "2.19.913"; + version = "2.20.902"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "urllib3.future"; tag = version; - hash = "sha256-ReoVZb31M1N1oxSFYGd1x1P5/qBx/oFEjaxJEiMwbvM="; + hash = "sha256-81t6yGmfON73oGg4uZYmVqeUpXX/SmKU69y/PfEWA7s="; }; postPatch = '' From 426c53d399120eb76bc04223838aef2f8fa76dc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 11 May 2026 10:05:52 -0700 Subject: [PATCH 0282/1079] python3Packages.wassima: 2.0.6 -> 2.1.0 Diff: https://github.com/jawah/wassima/compare/2.0.6...2.1.0 Changelog: https://github.com/jawah/wassima/blob/2.1.0/CHANGELOG.md --- pkgs/development/python-modules/wassima/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wassima/default.nix b/pkgs/development/python-modules/wassima/default.nix index 67196d717211..5a9a6b40240c 100644 --- a/pkgs/development/python-modules/wassima/default.nix +++ b/pkgs/development/python-modules/wassima/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "wassima"; - version = "2.0.6"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "wassima"; tag = version; - hash = "sha256-k7gLLSfVVCk2YO7WRof3s3L2DVgFitQl9KRq9Bc+fJ8="; + hash = "sha256-0YHj5cmGZlZqUow+xkpQKHe+KB4X/OklEs4u8z/uV18="; }; build-system = [ hatchling ]; From f66406d13c09f66be86d3f82435ba4478a5c8881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 11 May 2026 10:06:06 -0700 Subject: [PATCH 0283/1079] python3Packages.niquests: 3.18.7 -> 3.18.8 Diff: https://github.com/jawah/niquests/compare/v3.18.7...v3.18.8 Changelog: https://github.com/jawah/niquests/blob/v3.18.8/HISTORY.md --- pkgs/development/python-modules/niquests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix index f66a0d57f092..63f672046f6b 100644 --- a/pkgs/development/python-modules/niquests/default.nix +++ b/pkgs/development/python-modules/niquests/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "niquests"; - version = "3.18.7"; + version = "3.18.8"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "niquests"; tag = "v${version}"; - hash = "sha256-ujqnb0B282MJi+2oy9AJfJY3KCE5JTjuJuyeeV0gZWA="; + hash = "sha256-yr0N+wkGyscCz34xtAU7qMQT+kN341AL/7PZwGwzhpo="; }; build-system = [ hatchling ]; From 53dd2d01c05413a1f43a4c0ae2e7470f6e678e8a Mon Sep 17 00:00:00 2001 From: lukas-sgx Date: Mon, 11 May 2026 19:10:26 +0200 Subject: [PATCH 0284/1079] nixos/starship: respect pre-set STARSHIP_CONFIG env variable --- nixos/modules/programs/starship.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/starship.nix b/nixos/modules/programs/starship.nix index 3f9ba0a02435..849c91b12ed3 100644 --- a/nixos/modules/programs/starship.nix +++ b/nixos/modules/programs/starship.nix @@ -116,7 +116,7 @@ in # config file. starship appears to use a hardcoded config location # rather than one inside an XDG folder: # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651 - if [[ ! -f "$HOME/.config/starship.toml" ]]; then + if [[ ! -f "$${STARSHIP_CONFIG:-$HOME/.config/starship.toml}" ]]; then export STARSHIP_CONFIG=${settingsFile} fi eval "$(${cfg.package}/bin/starship init bash --print-full-init)" @@ -129,7 +129,8 @@ in # config file. starship appears to use a hardcoded config location # rather than one inside an XDG folder: # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651 - if not test -f "$HOME/.config/starship.toml"; + set -q STARSHIP_CONFIG; or set STARSHIP_CONFIG "$HOME/.config/starship.toml" + if not test -f "$STARSHIP_CONFIG" set -x STARSHIP_CONFIG ${settingsFile} end ${lib.optionalString (!isNull cfg.transientPrompt.left) '' @@ -153,7 +154,7 @@ in # config file. starship appears to use a hardcoded config location # rather than one inside an XDG folder: # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651 - if [[ ! -f "$HOME/.config/starship.toml" ]]; then + if [[ ! -f "$${STARSHIP_CONFIG:-$HOME/.config/starship.toml}" ]]; then export STARSHIP_CONFIG=${settingsFile} fi eval "$(${cfg.package}/bin/starship init zsh)" @@ -167,8 +168,11 @@ in # config file. starship appears to use a hardcoded config location # rather than one inside an XDG folder: # https://github.com/starship/starship/blob/686bda1706e5b409129e6694639477a0f8a3f01b/src/configure.rs#L651 - if not `$HOME/.config/starship.toml`: + import os as _os + _sc = _os.environ.get('STARSHIP_CONFIG', _os.path.join(_os.environ['HOME'], '.config/starship.toml')) + if not _os.path.isfile(_sc): $STARSHIP_CONFIG = ('${settingsFile}') + del _os, _sc execx($(${cfg.package}/bin/starship init xonsh)) ''; }; From aa65d6f3cb27593fbc426023fd44cd6a1a1267b7 Mon Sep 17 00:00:00 2001 From: coolcuber Date: Wed, 29 Apr 2026 15:22:38 -0400 Subject: [PATCH 0285/1079] topcom: init at 1.1.2 --- pkgs/by-name/to/topcom/package.nix | 83 ++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 pkgs/by-name/to/topcom/package.nix diff --git a/pkgs/by-name/to/topcom/package.nix b/pkgs/by-name/to/topcom/package.nix new file mode 100644 index 000000000000..38772035df8e --- /dev/null +++ b/pkgs/by-name/to/topcom/package.nix @@ -0,0 +1,83 @@ +{ + fetchpatch, + fetchzip, + lib, + stdenv, + + autoreconfHook, + cddlib, + gmpxx, + + programPrefix ? "topcom-", +}: +stdenv.mkDerivation (finalAttrs: { + pname = "topcom"; + version = "1.1.2"; + + versionUrl = builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version; + + src = fetchzip { + url = "https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM-Downloads/TOPCOM-${finalAttrs.versionUrl}.tgz"; + hash = "sha256-r6dA2rQzxMu0Xxq5yl9rBZ5MJTRnmWVLav/F/QpkZ1A="; + }; + + buildInputs = [ + cddlib + gmpxx + ]; + + nativeBuildInputs = [ + autoreconfHook + ]; + + __structuredAttrs = true; + + strictDeps = true; + + patches = [ + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/topcom/-/raw/67c9a20c8e1597898f3950b486b4287641823363/system-libs.patch"; + hash = "sha256-F+1ZtluGL3i+LKWp0poQnx2ZlV5TSp6WSK5yl2FmOP4"; + }) + ]; + + postPatch = '' + substituteInPlace lib-src/Makefile.am lib-src-reg/Makefile.am src/Makefile.am src-reg/Makefile.am \ + --replace-fail '$(includedir)/cddlib' '${lib.getDev cddlib}/include/cddlib' + ''; + + configureFlags = [ + "--program-prefix=${programPrefix}" + ]; + + enableParallelBuilding = true; + + doCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + for prog in $(find "$out/bin" -type f); do + echo "Checking $prog" + grep -q '^usage: ' <(echo "" | "$prog" 2>&1) && continue + "$prog" --help &>/dev/null && continue + echo "$prog doesn't seem to be working" >&2 + exit 1 + done + runHook postInstallCheck + ''; + + doInstallCheck = true; + + meta = { + description = "Package for computing Triangulations Of Point Configurations and Oriented Matroid"; + longDescription = '' + TOPCOM is a package for computing Triangulations Of Point Configurations + and Oriented Matroids. It was very much inspired by the maple program + PUNTOS, which was written by Jesus de Loera. TOPCOM is entirely written + in C++, so there is a significant speed up compared to PUNTOS. + ''; + homepage = "https://www.wm.uni-bayreuth.de/de/team/rambau_joerg/TOPCOM/index.html"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ coolcuber ]; + }; +}) From 22467a70515506d44c7fc4561f8040c0865a8542 Mon Sep 17 00:00:00 2001 From: Thomas Butter Date: Mon, 11 May 2026 18:35:17 +0000 Subject: [PATCH 0286/1079] repak: 0.2.2 -> 0.2.3 --- pkgs/by-name/re/repak/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/repak/package.nix b/pkgs/by-name/re/repak/package.nix index b3f261baa703..2de2271a0e8d 100644 --- a/pkgs/by-name/re/repak/package.nix +++ b/pkgs/by-name/re/repak/package.nix @@ -7,16 +7,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "repak"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "trumank"; repo = "repak"; tag = "v${finalAttrs.version}"; - hash = "sha256-nl05EsR52YFSR9Id3zFynhrBIvaqVwUOdjPlSp19Gcc="; + hash = "sha256-fvB8Loukfy35+hqt3fhAubHhSCAd1TFE6TuBZ0xUkxE="; }; - cargoHash = "sha256-i0pBd0ZiMIEFGZgvBgVNCfqPHE6E3Rt5pAHHVj1epLs="; + cargoHash = "sha256-1jpjVQ+EiDUnGaTwDHMpLwLA/CkVGdZ+iLiWEkEpAwg="; + + checkFlags = [ + "--skip=test::test_oodle" + ]; passthru.updateScript = nix-update-script { }; From c5842303e42b9deb263198054d2923a1dd5effc3 Mon Sep 17 00:00:00 2001 From: BatteredBunny Date: Tue, 14 Apr 2026 21:53:54 +0300 Subject: [PATCH 0287/1079] plezy: 1.30.0 -> 2.0.0 --- pkgs/by-name/pl/plezy/git-hashes.json | 5 +- pkgs/by-name/pl/plezy/package.nix | 13 +- pkgs/by-name/pl/plezy/pubspec.lock.json | 307 ++++++++---------- .../pl/plezy/replace-sentry-fork.patch | 32 ++ pkgs/by-name/pl/plezy/update.sh | 16 +- 5 files changed, 186 insertions(+), 187 deletions(-) create mode 100644 pkgs/by-name/pl/plezy/replace-sentry-fork.patch diff --git a/pkgs/by-name/pl/plezy/git-hashes.json b/pkgs/by-name/pl/plezy/git-hashes.json index e263d0dab5fb..1054b3331dcc 100644 --- a/pkgs/by-name/pl/plezy/git-hashes.json +++ b/pkgs/by-name/pl/plezy/git-hashes.json @@ -3,7 +3,8 @@ "auto_updater_macos": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", "auto_updater_platform_interface": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", "auto_updater_windows": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", + "background_downloader": "sha256-U41AQVdXceT5ZBgvBR90h3JAAU2BLpguglcVBTrTww4=", "material_symbols_icons": "sha256-XRB6AZ4Q33sQKVZFA8lgdXCW/bx55h/RpmuItmFYVJM=", - "os_media_controls": "sha256-kSJov92pvzFQGIKnQb6XlwRXTY0Xs4iOZmc/390yf0c=", - "wakelock_plus": "sha256-OOTRP8v5mUma3j+G+koWoAufxrynWFMMhCLecvd1MhE=" + "os_media_controls": "sha256-0Bghn1s28+xlcfSLyVA7B60atJkkdqcFKseSubPtzkQ=", + "wakelock_plus": "sha256-89xs0sLNuoCqApFqwEY+SEk2DUqjHf8JsSd7dfxX3P0=" } diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix index f7cd8f1b1736..7bd849f6fde2 100644 --- a/pkgs/by-name/pl/plezy/package.nix +++ b/pkgs/by-name/pl/plezy/package.nix @@ -25,13 +25,13 @@ let pname = "plezy"; - version = "1.30.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "edde746"; repo = "plezy"; tag = version; - hash = "sha256-9bB9L9f2s0i2xF4JIe4vlEpt/bmF1gf3gxcoHdCrYqc="; + hash = "sha256-Pi5M74CI6J31Pzaf7wnUFFTpbOSwOTWdKUoYuXt8+Zs="; }; simdutf = fetchurl { @@ -46,7 +46,7 @@ let ''; meta = { - description = "Modern cross-platform Plex client built with Flutter"; + description = "Modern cross-platform Plex & Jellyfin client built with Flutter"; homepage = "https://github.com/edde746/plezy"; mainProgram = "plezy"; license = lib.licenses.gpl3Only; @@ -70,6 +70,11 @@ let gitHashes = lib.importJSON ./git-hashes.json; + # Upstream uses a sentry-dart fork that fetches sentry-native as a zip instead of via + # git clone. The PR was merged and reverted upstream (getsentry/sentry-dart#3630), so + # we use upstream since theres no actual meaningful difference + patches = [ ./replace-sentry-fork.patch ]; + nativeBuildInputs = [ pkg-config copyDesktopItems @@ -134,7 +139,7 @@ let src = fetchurl { url = "https://github.com/edde746/plezy/releases/download/${version}/plezy-macos.dmg"; - hash = "sha256-a3LvwWZvLPD7yKKbC+oYXSgoHXUS+mOojzfDyW7/QOE="; + hash = "sha256-zkctxQIgpU9dGhv8SdVy2S4eFUQ7GgeaWzwSEvFrWWc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plezy/pubspec.lock.json b/pkgs/by-name/pl/plezy/pubspec.lock.json index 6121af2bbdf4..fc3071b89a7a 100644 --- a/pkgs/by-name/pl/plezy/pubspec.lock.json +++ b/pkgs/by-name/pl/plezy/pubspec.lock.json @@ -4,31 +4,31 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d", + "sha256": "8d7ff3948166b8ec5da0fbb5962000926b8e02f2ed9b3e51d1738905fbd4c98d", "url": "https://pub.dev" }, "source": "hosted", - "version": "91.0.0" + "version": "93.0.0" }, "analyzer": { "dependency": "transitive", "description": { "name": "analyzer", - "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08", + "sha256": "de7148ed2fcec579b19f122c1800933dfa028f6d9fd38a152b04b1516cec120b", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.4.1" + "version": "10.0.1" }, "analyzer_plugin": { "dependency": "transitive", "description": { "name": "analyzer_plugin", - "sha256": "825071d553c4aef2252196d46a665fbd8e0cb06de07725f25d1b29bd18d65fff", + "sha256": "7df504f0c9d6891bacc9f73a5a8c5f6fe4fc49c90ec8e3379916372906ba0b32", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.13.6" + "version": "0.14.1" }, "ansicolor": { "dependency": "transitive", @@ -107,11 +107,12 @@ "background_downloader": { "dependency": "direct main", "description": { - "name": "background_downloader", - "sha256": "4cb23d9ad4f5060944f38164e7b90d4bf99b57b2472a3bd4676e59b2db4afd06", - "url": "https://pub.dev" + "path": ".", + "ref": "1f42690", + "resolved-ref": "1f426908b0d9e1083de35b3dd353c3434ad32ef2", + "url": "https://github.com/edde746/background_downloader" }, - "source": "hosted", + "source": "git", "version": "9.5.4" }, "boolean_selector": { @@ -184,45 +185,45 @@ "source": "hosted", "version": "8.12.4" }, - "cached_network_image": { + "cached_network_image_ce": { "dependency": "direct main", "description": { - "name": "cached_network_image", - "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916", + "name": "cached_network_image_ce", + "sha256": "d4701fbbdf508de831e847fd1d49c644ffa6191c6018c416ab6f66bbe1ad5fff", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.1" + "version": "4.6.4" }, - "cached_network_image_platform_interface": { + "cached_network_image_platform_interface_ce": { "dependency": "transitive", "description": { - "name": "cached_network_image_platform_interface", - "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829", + "name": "cached_network_image_platform_interface_ce", + "sha256": "95343645becaeac01dd6eeb9f3a85448b6076d211010ff1973e8bbfd840b571d", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.1" + "version": "5.2.0" }, - "cached_network_image_web": { + "cached_network_image_web_ce": { "dependency": "transitive", "description": { - "name": "cached_network_image_web", - "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062", + "name": "cached_network_image_web_ce", + "sha256": "6bcd8608d4ace7c35625f09d971ce68c7a6581a4631b0fb6ceb2909b2c2e17a8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.1" + "version": "2.1.1" }, "characters": { "dependency": "transitive", "description": { "name": "characters", - "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.0" }, "charcode": { "dependency": "transitive", @@ -285,7 +286,7 @@ "version": "4.11.1" }, "collection": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "collection", "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", @@ -324,6 +325,16 @@ "source": "hosted", "version": "3.1.2" }, + "cronet_http": { + "dependency": "direct main", + "description": { + "name": "cronet_http", + "sha256": "07bfb4c6158aef72f8004631826abaeecdeaa2b6042f5f8916b8db20e1d01b4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, "cross_file": { "dependency": "transitive", "description": { @@ -345,7 +356,7 @@ "version": "3.0.7" }, "cryptography": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "cryptography", "sha256": "3eda3029d34ec9095a27a198ac9785630fe525c0eb6a49f3d575272f8e792ef0", @@ -364,15 +375,25 @@ "source": "hosted", "version": "1.0.2" }, + "cupertino_http": { + "dependency": "direct main", + "description": { + "name": "cupertino_http", + "sha256": "82cbec60c90bf785a047a9525688b6dacac444e177e1d5a5876963d3c50369e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, "dart_code_linter": { "dependency": "direct dev", "description": { "name": "dart_code_linter", - "sha256": "1b53722d9933a5f5d4580acc29c7f16b1fde66d21d1ecf7bb2a811caf3a42b42", + "sha256": "8ece88f710621ca1c40b6c344b316d78bb2269d728d37d2a44f19a81d9d2cb93", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "4.0.2" }, "dart_discord_presence": { "dependency": "direct main", @@ -388,11 +409,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b", + "sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.7" }, "dbus": { "dependency": "transitive", @@ -424,26 +445,6 @@ "source": "hosted", "version": "7.0.3" }, - "dio": { - "dependency": "direct main", - "description": { - "name": "dio", - "sha256": "aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.9.2" - }, - "dio_web_adapter": { - "dependency": "transitive", - "description": { - "name": "dio_web_adapter", - "sha256": "2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, "drift": { "dependency": "direct main", "description": { @@ -550,16 +551,6 @@ "source": "sdk", "version": "0.0.0" }, - "flutter_cache_manager": { - "dependency": "direct main", - "description": { - "name": "flutter_cache_manager", - "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.4.1" - }, "flutter_lints": { "dependency": "direct dev", "description": { @@ -608,6 +599,26 @@ "source": "sdk", "version": "0.0.0" }, + "freezed": { + "dependency": "direct dev", + "description": { + "name": "freezed", + "sha256": "f23ea33b3863f119b58ed1b586e881a46bd28715ddcc4dbc33104524e3434131", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.5" + }, + "freezed_annotation": { + "dependency": "direct main", + "description": { + "name": "freezed_annotation", + "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, "glob": { "dependency": "transitive", "description": { @@ -628,6 +639,16 @@ "source": "hosted", "version": "2.3.2" }, + "hive_ce": { + "dependency": "transitive", + "description": { + "name": "hive_ce", + "sha256": "8e9980e68643afb1e765d3af32b47996552a64e190d03faf622cea07c1294418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.19.3" + }, "hooks": { "dependency": "transitive", "description": { @@ -678,25 +699,15 @@ "source": "hosted", "version": "4.1.2" }, - "in_app_review": { - "dependency": "direct main", - "description": { - "name": "in_app_review", - "sha256": "ab26ac54dbd802896af78c670b265eaeab7ecddd6af4d0751e9604b60574817f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.11" - }, - "in_app_review_platform_interface": { + "http_profile": { "dependency": "transitive", "description": { - "name": "in_app_review_platform_interface", - "sha256": "fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10", + "name": "http_profile", + "sha256": "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.5" + "version": "0.1.0" }, "intl": { "dependency": "direct main", @@ -718,6 +729,16 @@ "source": "hosted", "version": "1.0.5" }, + "isolate_channel": { + "dependency": "transitive", + "description": { + "name": "isolate_channel", + "sha256": "a9d3d620695bc984244dafae00b95e4319d6974b2d77f4b9e1eb4f2efe099094", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.1" + }, "jni": { "dependency": "transitive", "description": { @@ -742,11 +763,11 @@ "dependency": "direct dev", "description": { "name": "json_serializable", - "sha256": "c5b2ee75210a0f263c6c7b9eeea80553dbae96ea1bf57f02484e806a3ffdffa3", + "sha256": "5b89c1e32ae3840bb20a1b3434e3a590173ad3cb605896fb0f60487ce2f8104e", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.11.2" + "version": "6.11.4" }, "leak_tracker": { "dependency": "transitive", @@ -812,21 +833,21 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.18" + "version": "0.12.17" }, "material_color_utilities": { "dependency": "transitive", "description": { "name": "material_color_utilities", - "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.13.0" + "version": "0.11.1" }, "material_symbols_icons": { "dependency": "direct main", @@ -859,16 +880,6 @@ "source": "hosted", "version": "2.0.0" }, - "mobile_scanner": { - "dependency": "direct main", - "description": { - "name": "mobile_scanner", - "sha256": "c92c26bf2231695b6d3477c8dcf435f51e28f87b1745966b1fe4c47a286171ce", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.2.0" - }, "native_toolchain_c": { "dependency": "transitive", "description": { @@ -923,12 +934,12 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "467251821f76bba37ed4c6d5ee1c9de27c285e34", - "resolved-ref": "467251821f76bba37ed4c6d5ee1c9de27c285e34", + "ref": "5ddd27c", + "resolved-ref": "5ddd27c2acacca31060d288db1371a870602cf46", "url": "https://github.com/edde746/os-media-controls" }, "source": "git", - "version": "0.2.0" + "version": "0.2.1" }, "package_config": { "dependency": "transitive", @@ -1021,7 +1032,7 @@ "version": "2.2.1" }, "path_provider_platform_interface": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "path_provider_platform_interface", "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", @@ -1061,7 +1072,7 @@ "version": "3.1.6" }, "plugin_platform_interface": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "plugin_platform_interface", "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", @@ -1170,16 +1181,6 @@ "source": "hosted", "version": "4.1.0" }, - "rxdart": { - "dependency": "transitive", - "description": { - "name": "rxdart", - "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.28.0" - }, "saf_stream": { "dependency": "direct main", "description": { @@ -1254,21 +1255,21 @@ "dependency": "transitive", "description": { "name": "sentry", - "sha256": "a49b4fb1cba576fe216347dc2a0e6d76076fb998e6012857db96f991c23b7b3c", + "sha256": "288aee3d35f252ac0dc3a4b0accbbe7212fa2867604027f2cc5bc65334afd743", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.15.0" + "version": "9.16.0" }, "sentry_flutter": { "dependency": "direct main", "description": { "name": "sentry_flutter", - "sha256": "25150030c93bd1d4b727ab61cfb09e99121c69ce90fa820bb9ca16dab433e43a", + "sha256": "f9e87d5895cc437902aa2b081727ee7e46524fe7cc2e1910f535480a3eeb8bed", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.15.0" + "version": "9.16.0" }, "serial_csv": { "dependency": "transitive", @@ -1321,7 +1322,7 @@ "version": "2.4.1" }, "shared_preferences_platform_interface": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "shared_preferences_platform_interface", "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", @@ -1420,11 +1421,11 @@ "dependency": "transitive", "description": { "name": "source_helper", - "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723", + "sha256": "1d3b229b2934034fb2e691fbb3d53e0f75a4af7b1407f88425ed8f209bcb1b8f", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.8" + "version": "1.3.11" }, "source_span": { "dependency": "transitive", @@ -1436,56 +1437,6 @@ "source": "hosted", "version": "1.10.2" }, - "sqflite": { - "dependency": "transitive", - "description": { - "name": "sqflite", - "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "sqflite_android": { - "dependency": "transitive", - "description": { - "name": "sqflite_android", - "sha256": "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2+3" - }, - "sqflite_common": { - "dependency": "transitive", - "description": { - "name": "sqflite_common", - "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.6" - }, - "sqflite_darwin": { - "dependency": "transitive", - "description": { - "name": "sqflite_darwin", - "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "sqflite_platform_interface": { - "dependency": "transitive", - "description": { - "name": "sqflite_platform_interface", - "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, "sqlite3": { "dependency": "transitive", "description": { @@ -1556,16 +1507,6 @@ "source": "hosted", "version": "1.4.1" }, - "synchronized": { - "dependency": "transitive", - "description": { - "name": "synchronized", - "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.4.0" - }, "term_glyph": { "dependency": "transitive", "description": { @@ -1580,11 +1521,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.9" + "version": "0.7.7" }, "typed_data": { "dependency": "transitive", @@ -1600,11 +1541,11 @@ "dependency": "direct main", "description": { "name": "universal_gamepad", - "sha256": "6177944707639a20dd4f89e7f8d78bf66b40ba03d70a1962754d3bba45e14ccd", + "sha256": "3ada9b26e3b3471adc414fd50b8a27d2f890301d9d4cfd7a46732988a9f143d0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.4" + "version": "1.5.5" }, "url_launcher": { "dependency": "direct main", @@ -1750,8 +1691,8 @@ "dependency": "direct main", "description": { "path": "wakelock_plus", - "ref": "HEAD", - "resolved-ref": "0085d705c80a961a4a5eeaa4ee8f723dcf4bc9b8", + "ref": "8595fee595c952b73d430f2eab05f2e0d858290e", + "resolved-ref": "8595fee595c952b73d430f2eab05f2e0d858290e", "url": "https://github.com/edde746/wakelock_plus" }, "source": "git", @@ -1827,6 +1768,16 @@ "source": "hosted", "version": "2.1.0" }, + "win_http": { + "dependency": "direct main", + "description": { + "name": "win_http", + "sha256": "efbfec044d43665e271b2c51d40864275d055b28eda1e9feddb42d884ae982df", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "window_manager": { "dependency": "direct main", "description": { diff --git a/pkgs/by-name/pl/plezy/replace-sentry-fork.patch b/pkgs/by-name/pl/plezy/replace-sentry-fork.patch new file mode 100644 index 000000000000..7ea9482ccebf --- /dev/null +++ b/pkgs/by-name/pl/plezy/replace-sentry-fork.patch @@ -0,0 +1,32 @@ +--- a/pubspec.yaml ++++ b/pubspec.yaml +@@ -56,11 +56,7 @@ + git: + url: https://github.com/edde746/background_downloader + ref: 1f42690 +- sentry_flutter: +- git: +- url: https://github.com/edde746/sentry-dart +- path: packages/flutter +- ref: build/fetch-native-zip ++ sentry_flutter: 9.16.0 + auto_updater: + git: + url: https://github.com/edde746/auto_updater +@@ -102,16 +98,6 @@ + url: https://github.com/edde746/auto_updater + ref: 9e150f7 + path: packages/auto_updater_windows +- sentry: +- git: +- url: https://github.com/edde746/sentry-dart +- path: packages/dart +- ref: build/fetch-native-zip +- sentry_flutter: +- git: +- url: https://github.com/edde746/sentry-dart +- path: packages/flutter +- ref: build/fetch-native-zip + material_symbols_icons: + git: + url: https://github.com/edde746/material_symbols_icons diff --git a/pkgs/by-name/pl/plezy/update.sh b/pkgs/by-name/pl/plezy/update.sh index 6befc9c04271..c7734d7b5353 100755 --- a/pkgs/by-name/pl/plezy/update.sh +++ b/pkgs/by-name/pl/plezy/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go +#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go flutter338 git set -eou pipefail @@ -26,8 +26,18 @@ DMG_URL="https://github.com/edde746/plezy/releases/download/${latestVersion}/ple DMG_SHA=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$(nix-prefetch-url "$DMG_URL")") sed -i "/plezy-macos.dmg/,/hash/{s|hash = \".*\"|hash = \"${DMG_SHA}\"|}" "$ROOT/package.nix" -curl --fail --silent "https://raw.githubusercontent.com/edde746/plezy/${latestVersion}/pubspec.lock" \ - | yq eval --output-format=json --prettyPrint > "$ROOT/pubspec.lock.json" +# Only here to handle the patched pubsec.yaml +workdir=$(mktemp -d) +trap 'rm -rf "$workdir"' EXIT + +curl --fail --silent --location "$GIT_SRC_URL" | tar -xz -C "$workdir" --strip-components=1 +patch -d "$workdir" -p1 < "$ROOT/replace-sentry-fork.patch" + +export PUB_CACHE="$workdir/.pub-cache" +flutter --no-version-check config --no-analytics >/dev/null +flutter --no-version-check pub --directory "$workdir" get + +yq eval --output-format=json --prettyPrint "$workdir/pubspec.lock" > "$ROOT/pubspec.lock.json" python3 "$(dirname "$(readlink -f "$0")")/../../../development/compilers/dart/fetch-git-hashes.py" \ --input "$ROOT/pubspec.lock.json" \ From 1f457fe8ccdf2b83b1639eedf2a3f65951e26ce2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 19:04:15 +0000 Subject: [PATCH 0288/1079] trufflehog: 3.95.2 -> 3.95.3 --- pkgs/by-name/tr/trufflehog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index 1c3523c96949..310fbcf9507d 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "trufflehog"; - version = "3.95.2"; + version = "3.95.3"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${finalAttrs.version}"; - hash = "sha256-7hHeJ+RBUUBznl9gm6IwemFsHLiKHh6B7T96jpEsAC0="; + hash = "sha256-FFYDlETo7r2j1e4l+oJ3yWn1hUyA/4Xe7onrX8GidZg="; }; vendorHash = "sha256-2WBdBsOXjj4/9hLA+yk5PQAqOgi5vn1cH4NnkHg8umI="; From fb4b4fb02692a59dff7ccdc05ffd2c88827a60a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 19:31:26 +0000 Subject: [PATCH 0289/1079] pinniped: 0.45.0 -> 0.46.0 --- pkgs/by-name/pi/pinniped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pinniped/package.nix b/pkgs/by-name/pi/pinniped/package.nix index ebc07cfc9fbf..f35c573969c3 100644 --- a/pkgs/by-name/pi/pinniped/package.nix +++ b/pkgs/by-name/pi/pinniped/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "pinniped"; - version = "0.45.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-KYhMJjUu+6suT9o4RbGRyBl5ItiYt/5JQPg4fUzqs0M="; + sha256 = "sha256-C7N6iPD4caTUXR6gB+9sdfBlWyT1tfE8KwE5WaiUdQM="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-PAq+Oc8+Iib3/hBGrC0xQl+kBtWtsU7XS0alJePkO7k="; + vendorHash = "sha256-B94/SR2OVsxDs9+MaivxPBMQsNWFwAEwuDT7xvWN8vg="; ldflags = [ "-s" From 4eb0abf7314ba0c9c186101c9f46c76e973b2b96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 19:36:02 +0000 Subject: [PATCH 0290/1079] pdfcpu: 0.12.0 -> 0.12.1 --- pkgs/by-name/pd/pdfcpu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix index 38f4f4b51726..7a55adc0ed1f 100644 --- a/pkgs/by-name/pd/pdfcpu/package.nix +++ b/pkgs/by-name/pd/pdfcpu/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "pdfcpu"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "pdfcpu"; repo = "pdfcpu"; tag = "v${finalAttrs.version}"; - hash = "sha256-qCSfcxeMM7HzJIaeZJxjUVc834NmigpDKaxFQ0oSdkg="; + hash = "sha256-xAWzn32evg3PmHlevL38P06zOof3a4mmLmNuFfO2gAU="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the From a350fc4a03aadb53361295d50a425fd3cc9d6903 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Mon, 11 May 2026 15:21:49 -0400 Subject: [PATCH 0291/1079] fetchurl: use concatMap rather than filtering and mapping --- pkgs/build-support/fetchurl/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index ddd307563367..2f75079ead55 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -201,7 +201,13 @@ lib.extendMkDerivation { urls_ = let - u = lib.lists.filter (url: lib.isString url) (map rewriteURL preRewriteUrls); + u = lib.lists.concatMap ( + url: + let + rewritten = rewriteURL url; + in + if lib.isString rewritten then [ rewritten ] else [ ] + ) preRewriteUrls; in if u == [ ] then throw "urls is empty after rewriteURL (was ${toString preRewriteUrls})" else u; From 88d552942a97b0e78ed98203c0db6aab4749a5f1 Mon Sep 17 00:00:00 2001 From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com> Date: Mon, 11 May 2026 20:19:34 +0000 Subject: [PATCH 0292/1079] maintainers/github-teams.json: Automated sync --- maintainers/github-teams.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 6296c340ca8b..6e794d09bd5f 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -292,7 +292,6 @@ "mdarocha": 11572618 }, "members": { - "GGG-KILLER": 5892127, "IvarWithoutBones": 41924494, "JamieMagee": 1358764, "anpin": 6060545, @@ -592,6 +591,8 @@ "7c6f434c": 1891350, "Shados": 338268, "khaneliman": 1778670, + "lolbinarycat": 19915050, + "mrcjkb": 12857160, "spencerpogo": 34356756 }, "name": "lua" From 3cd4b2336be2031cbdd43dd078dd379ecfda6a0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 20:37:02 +0000 Subject: [PATCH 0293/1079] githooks: 3.0.5 -> 3.0.6 --- pkgs/by-name/gi/githooks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/githooks/package.nix b/pkgs/by-name/gi/githooks/package.nix index 589ea0e014b5..cfc7f23c4f97 100644 --- a/pkgs/by-name/gi/githooks/package.nix +++ b/pkgs/by-name/gi/githooks/package.nix @@ -9,17 +9,17 @@ }: buildGoModule (finalAttrs: { pname = "githooks"; - version = "3.0.5"; + version = "3.0.6"; src = fetchFromGitHub { owner = "gabyx"; repo = "githooks"; rev = "v${finalAttrs.version}"; - hash = "sha256-aVrMM7gZF7o6WR2/8SEsfLFsqTSbXpr7UtcSB+eO/oQ="; + hash = "sha256-aRv8zSTnpoQfhajagMKT0rpOmNWt0X4jiKv0kS6cQUE="; }; modRoot = "./githooks"; - vendorHash = "sha256-ZcDD4Z/thtyCvXg6GzzKC/FSbh700QEaqXU8FaZaZc4="; + vendorHash = "sha256-ULPbM/6DqyVPwq68MnpVesS3w1uxKBbVIZ7i5Kng+1Y="; nativeBuildInputs = [ makeWrapper ]; From d916535215477b744e17fea0959d2c10aa303f0d Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 11 May 2026 17:04:33 -0400 Subject: [PATCH 0294/1079] copilot-cli: remove as end-of-life "AWS Copilot CLI will reach end-of-support on June 12, 2026." https://aws.amazon.com/blogs/containers/announcing-the-end-of-support-for-the-aws-copilot-cli/ --- pkgs/by-name/co/copilot-cli/package.nix | 57 ------------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 pkgs/by-name/co/copilot-cli/package.nix diff --git a/pkgs/by-name/co/copilot-cli/package.nix b/pkgs/by-name/co/copilot-cli/package.nix deleted file mode 100644 index 22a3bdff9bb1..000000000000 --- a/pkgs/by-name/co/copilot-cli/package.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - stdenv, - buildGoModule, - fetchFromGitHub, - installShellFiles, - testers, - copilot-cli, -}: - -buildGoModule (finalAttrs: { - pname = "copilot-cli"; - version = "1.34.1"; - - src = fetchFromGitHub { - owner = "aws"; - repo = "copilot-cli"; - rev = "v${finalAttrs.version}"; - hash = "sha256-Oxt1+0z+woNPsFuCkj4t71/e21mHtoCd281BwbHCGc8="; - }; - - vendorHash = "sha256-ZdYuQAdjzvxxqKHoiHfhfJff3OfEE7ciIGcX1W3jVXY="; - - nativeBuildInputs = [ installShellFiles ]; - - # follow LINKER_FLAGS in Makefile - ldflags = [ - "-s" - "-w" - "-X github.com/aws/copilot-cli/internal/pkg/version.Version=v${finalAttrs.version}" - "-X github.com/aws/copilot-cli/internal/pkg/cli.binaryS3BucketPath=https://ecs-cli-v2-release.s3.amazonaws.com" - ]; - - subPackages = [ "./cmd/copilot" ]; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd copilot \ - --bash <($out/bin/copilot completion bash) \ - --fish <($out/bin/copilot completion fish) \ - --zsh <($out/bin/copilot completion zsh) - ''; - - passthru.tests.version = testers.testVersion { - package = copilot-cli; - command = "copilot version"; - version = "v${finalAttrs.version}"; - }; - - meta = { - description = "Build, Release and Operate Containerized Applications on AWS"; - homepage = "https://github.com/aws/copilot-cli"; - changelog = "https://github.com/aws/copilot-cli/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ jiegec ]; - mainProgram = "copilot"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 403b2b4aa6ed..1b016278dca8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -541,6 +541,7 @@ mapAliases { conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08 cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27 + copilot-cli = throw "'copilot-cli' was removed due to upstream end-of-life."; # Added 2026-05-11 copilot-language-server-fhs = warnAlias "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07 copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22 cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07 From 7d318dfe3b95f6ce5f97db40a3b2dee704d75227 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Mon, 30 Mar 2026 22:57:31 +0200 Subject: [PATCH 0295/1079] pnpm_11: init at 11.1.0 Signed-off-by: Sefa Eyeoglu --- .../javascript.section.md | 56 ++++------------ .../node/fetch-pnpm-deps/serve.nix | 5 ++ pkgs/development/tools/pnpm/default.nix | 4 ++ pkgs/development/tools/pnpm/generic.nix | 29 +++++---- pkgs/test/pnpm/default.nix | 1 + pkgs/test/pnpm/pnpm-fixup-state-db/index.db | Bin 65536 -> 61440 bytes pkgs/test/pnpm/pnpm_11/default.nix | 60 ++++++++++++++++++ pkgs/test/pnpm/pnpm_11/src/.gitignore | 2 + pkgs/test/pnpm/pnpm_11/src/index.ts | 1 + pkgs/test/pnpm/pnpm_11/src/package.json | 20 ++++++ pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml | 39 ++++++++++++ pkgs/test/pnpm/pnpm_11/src/tsconfig.json | 13 ++++ pkgs/top-level/all-packages.nix | 3 +- 13 files changed, 176 insertions(+), 57 deletions(-) create mode 100644 pkgs/test/pnpm/pnpm_11/default.nix create mode 100644 pkgs/test/pnpm/pnpm_11/src/.gitignore create mode 100644 pkgs/test/pnpm/pnpm_11/src/index.ts create mode 100644 pkgs/test/pnpm/pnpm_11/src/package.json create mode 100644 pkgs/test/pnpm/pnpm_11/src/pnpm-lock.yaml create mode 100644 pkgs/test/pnpm/pnpm_11/src/tsconfig.json diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 362130e5ba5f..58a0805cc58d 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -305,7 +305,7 @@ This package puts the corepack wrappers for pnpm and yarn in your PATH, and they ### pnpm {#javascript-pnpm} -pnpm is available as the top-level package `pnpm`. Additionally, there are variants pinned to certain major versions, like `pnpm_8`, `pnpm_9` and `pnpm_10`, which support different sets of lock file versions. +pnpm is available as the top-level package `pnpm`. Additionally, there are variants pinned to certain major versions, like `pnpm_8`, `pnpm_9`, `pnpm_10`, `pnpm_10_29_2` and `pnpm_11`, which support different sets of lock file versions. When packaging an application that includes a `pnpm-lock.yaml`, you need to fetch the pnpm store for that project using a fixed-output-derivation. The function `fetchPnpmDeps` can create this pnpm store derivation. In conjunction, the setup hook `pnpmConfigHook` will prepare the build environment to install the pre-fetched dependencies store. Here is an example for a package that contains `package.json` and a `pnpm-lock.yaml` files using the fetcher and setup hook above: @@ -313,11 +313,18 @@ When packaging an application that includes a `pnpm-lock.yaml`, you need to fetc { fetchPnpmDeps, nodejs, - pnpm, + pnpm_11, pnpmConfigHook, stdenv, }: - +let + # It is recommended to pin pnpm to a major version, due to regular breaking changes in the store format + # The latest major version is always available under `pkgs.pnpm` + # Optionally override pnpm to use a custom nodejs version + # Make sure that the same nodejs version is referenced in nativeBuildInputs + # pnpm = pnpm_11.override { nodejs = nodejs_24; }; + pnpm = pnpm_11; +in stdenv.mkDerivation (finalAttrs: { pname = "foo"; version = "0-unstable-1980-01-01"; @@ -334,54 +341,13 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; + inherit pnpm; fetcherVersion = 3; hash = "..."; }; }) ``` -It is highly recommended to use a pinned version of pnpm (i.e., `pnpm_9` or `pnpm_10`), to increase future reproducibility. It might also be required to use an older version if the package needs support for a certain lock file version. To do so, you can pass the `pnpm` argument to `fetchPnpmDeps` and override the `pnpm` arg in `pnpmConfigHook`. Here are the changes in the example above to use a pinned pnpm version: - - - -```diff - { - fetchPnpmDeps, - nodejs, -- pnpm, -+ pnpm_10, - pnpmConfigHook, - stdenv, - }: -+let -+ # Optionally override pnpm to use a custom nodejs version -+ # Make sure that the same nodejs version is referenced in nativeBuildInputs -+ # pnpm = pnpm_10.override { nodejs = nodejs_20; }; -+in - stdenv.mkDerivation (finalAttrs: { - pname = "foo"; - version = "0-unstable-1980-01-01"; - - src = { - #... - }; - - nativeBuildInputs = [ - nodejs # in case scripts are run outside of a pnpm call - pnpmConfigHook -- pnpm # At least required by pnpmConfigHook, if not other (custom) phases -+ pnpm_10 # At least required by pnpmConfigHook, if not other (custom) phases - ]; - - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname version src; -+ pnpm = pnpm_10; - fetcherVersion = 3; - hash = "..."; - }; - }) -``` - In case you are patching `package.json` or `pnpm-lock.yaml`, make sure to pass `finalAttrs.patches` to the function as well (i.e., `inherit (finalAttrs) patches`. `pnpmConfigHook` supports adding additional `pnpm install` flags via `pnpmInstallFlags` which can be set to a Nix string array: diff --git a/pkgs/build-support/node/fetch-pnpm-deps/serve.nix b/pkgs/build-support/node/fetch-pnpm-deps/serve.nix index 9aa5d380a0cd..46288e974660 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/serve.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/serve.nix @@ -3,6 +3,7 @@ pnpm, pnpmDeps, zstd, + lib, }: writeShellApplication { @@ -41,4 +42,8 @@ writeShellApplication { pnpm server start \ --store-dir "$storePath" ''; + + meta = { + broken = lib.versionAtLeast pnpm.version "11"; + }; } diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index 3975dbc04277..c1423124fc24 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -25,6 +25,10 @@ let version = "10.33.4"; hash = "sha256-jnDdxmSbGLw9iVzzqQjAKR6kw4A5rYcixH4Bja8enPw="; }; + "11" = { + version = "11.1.0"; + hash = "sha256-VzyCrTVuiwl+bKxIG3OB+d7tM6MYr38xGYSFjr4fl+8="; + }; }; callPnpm = variant: callPackage ./generic.nix { inherit (variant) version hash; }; diff --git a/pkgs/development/tools/pnpm/generic.nix b/pkgs/development/tools/pnpm/generic.nix index 76a0b40835e4..aa50a4fd3a52 100644 --- a/pkgs/development/tools/pnpm/generic.nix +++ b/pkgs/development/tools/pnpm/generic.nix @@ -10,6 +10,7 @@ testers, buildPackages, bashNonInteractive, + tests, withNode ? true, version, @@ -43,16 +44,21 @@ stdenvNoCC.mkDerivation (finalAttrs: { rm -r package/dist/reflink.*node package/dist/vendor ''; - installPhase = '' - runHook preInstall + installPhase = + let + # Use ESM pnpm for versions > 11 + ext = if lib.versionOlder finalAttrs.version "11" then "cjs" else "mjs"; + in + '' + runHook preInstall - install -d $out/{bin,libexec} - cp -R . $out/libexec/pnpm - ln -s $out/libexec/pnpm/bin/pnpm.cjs $out/bin/pnpm - ln -s $out/libexec/pnpm/bin/pnpx.cjs $out/bin/pnpx + install -d $out/{bin,libexec} + cp -R . $out/libexec/pnpm + ln -s $out/libexec/pnpm/bin/pnpm.${ext} $out/bin/pnpm + ln -s $out/libexec/pnpm/bin/pnpx.${ext} $out/bin/pnpx - runHook postInstall - ''; + runHook postInstall + ''; postInstall = if lib.toInt (lib.versions.major version) < 9 then @@ -105,9 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { ); inherit nodejs majorVersion; - tests.version = lib.optionalAttrs withNode ( - testers.testVersion { package = finalAttrs.finalPackage; } - ); + tests = { + inherit (tests) pnpm; + version = lib.optionalAttrs withNode (testers.testVersion { package = finalAttrs.finalPackage; }); + }; updateScript = writeScript "pnpm-update-script" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix index 85874ec1a57f..8cc5708ec735 100644 --- a/pkgs/test/pnpm/default.nix +++ b/pkgs/test/pnpm/default.nix @@ -2,4 +2,5 @@ { pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { }; pnpm-fixup-state-db = callPackage ./pnpm-fixup-state-db { }; + pnpm_11 = callPackage ./pnpm_11 { }; } diff --git a/pkgs/test/pnpm/pnpm-fixup-state-db/index.db b/pkgs/test/pnpm/pnpm-fixup-state-db/index.db index 705910416a042a68be532125cea69f6f6ee943dc..aa5dcd007e269e2024d09d8e4a995fa0b588a1ad 100644 GIT binary patch delta 13499 zcmZ{q3y@vKdFLf89%gw+tl3(?4=TlGldwqLeY(%-u!+4B#3q$gZPotz z&YU}Uz@hx$%(?g6ue-nR|NZ~}@9f;UXy=i4-F4QIcP&`3;8gzG{d3IS|Eb`QOTYLp zC-bLcPF=F#)ay@Oa&XDnkDt;mIrTp*JhiP({qDO@xOc%xzi`Tu6YhO}*XK{@?fUkX z<92QN%pJE)ZgfVf^LD5!Z`ro}V;k14+VN3$^UW8oTf5=n%P!n6vwEzt?uMYA2 zTR;5acTepYPm^I{WPECQxl}AIzBjS_o@Xc87tTDV{nmSzEi4Yc_1-fU9$a+e!wY)^ z|L))2cI>Xne>`qBs;$?qA6;**xL}J~akUMXu3kAF*DJAd)eg6&xJj(ov}*Ge7d7&V ztM!Omb-{MK`qntLa^qFw`nGNQVzGX0F}iBqh0E-^%dWoo+)LJu*W0cZ*Iu;YCZgIl z8b`v&dHvv)S4(BRRDG{~_RL>yzyAKy7S`<_zkm4&|NZHNL1= z@9{@Jaon!0yMA=q?1Cr9Zr*mKvT=J;UwWmv%*7qDnY`wTD{r|(U%Y;N(*{?YHJ4p! zcGPRvTzSdFq*^gK=GW{Vr{v=63i8u9YNCtrT(CkNc*j?r+##<8)RCzr;h zQuNi`t85WKlLrHnFzKRQ$dys+xaG$_A|!D=!V3l9E-TY?N=jGqv-= zRW5l#RwZHfDkTz|U9duLL}|+^l%5=nsbF(UU9)B(LMZv-_|r~V(IMv zy*)}1oz>*Eb1DXHFtZR%kwklHe?68j{niX;Rg@D5PBO&Hpd&rC&ogWoPXLk=F_&Obh;`; zRjNW(DVCxUWV-M{6y%H`84YPvYggN{^dy}EGYZnt1sfY;iOCeQF`9F(OQNfdp~$>+ zvf(kdM}28yw2{6fBUD{#<;oa?m!X>3$DiE0KWyGMImK}gpL33{XuK&zF0INJN>i9F zlx&hNVrfKE>U_(JD%FITC>1_bI++?%R;Hg>J<%xP*hr;hWK}%IH8yH8G*+q!!Int{ zTY;Jm2rQyePN?X0EQA;RbH4nd{b6i$a%^*YM|{E=vR0O%cFO2T^|3zT6ggfhMskfoCSDox23 zyr2dJxtMYuE`IQ9Ild`3I`z&I?gf)kM3;)}pdf42WHd1)m8gA9ky#GARFN`w`Sgv` z+Ip~u+AK>-Oi3qlT@^{@pk2iZDD328toV#<62KU0OX-+s$#2tusO%@$Bx0{$&w?ogK3#ihjZMz^q$3z%zyd36tO1{*Un<8udd4&HrU|#@ zo$+a)%xF$VO5;ISQ3VZJxe#Qs)`kkKiMFvemh?^PT$@_CDuNtRRqDb*mKB(6sc&|s zp*~#UV&gQqR%p-CV#dTuTE1NcaGgz7{ExInNkZlmcGtGofBVd?mE>(pK4=1<+{(gI zS*9dFR;&t&BoGD#C@kAVN6Sr5QpVbZoZ1wx1LPbKFC9l*0Kd)(P#io`N$7?S;!8k9 z>QKdsES5C~5qp-vq!M7$OyYff_ntU9Kjm_4`58{jAPgu-h>;(yY(d`;)&dVwdlh`e z%Bz}HTcsi$tgt#Yw#nU17ImOyc)A728tFlm2G)9tRLfu$Y}3$02wu`Ey0 zaI`a9cKfgFi(^~d$mlyxl%J-7DN@=A*b&{MXpHsrGnD}R(j;=oGzAC|pa2wzak5Oo z_xSlT06OGT0Iw+}dUp&FN&({3j?-;yMdJV#VGmrC6`4X+)G1Ins`0F^U$bZY(Y|y` zdV9g<-D^nFUxBYPQ&DnOiuG$6aYY_Fkx~<@+|>GMR997?RRdsDZ<&A-2mw%6 zWolvJfP550A>mS^;Ra=$fhUpz>@Hab3>H#BYyf=O5AUUae7c!`usaw0MQ>+LYR&pU zd|lT$mYk;0O$yTxBD6+CYE*$^RZuchf!g~7LSmxA|=$w*J38(Xqmv?V>*!u)@38 zR}X~|9`09^sf6WLMJXX7oW85Ip}E>fZF7*?SC;4-n3#kkcq)tb--r-YOq6!0I7*7h zM;eEr`@qVial{^kb1(=^nUrt|VSBu0NI8{XnGnJO5YZs zwTDq^XO%Ryp++FO$rsL)91C9%shNrI<)i)h=I?Bdj|e!bx*$%#B8!FGJ^^iF_VhQp zIq*y6^qB$m3TXVAVAhPj`nh8X9q+4YC;6 z01#L~x&;Kb(Lh0qeJ|hN#kiXoDTR{8%jsm=1}msN9n7R6X8N2D$@JmKkYmsY zKtQU(HX5psamCcN6O9KVEDQC(kBHPv6QV^Yparxfjcdvi22m1uf_nA}1EA0XH9Rl( zmD@kHXEaUC+sqsre2+G%5s0=Dy08^kV(6?eseY&PhyoBgH$tPDx)M-XuZ)no(JAwI z0E_c(ctioL^vSUm{0T}( zlGp;isA@hIQF$O7!Yo5E=m>F=pt*2`X~2bkXqW!;{&5#>b~mM^n17E)VA~_R zj4X*{A0!DC4^Jom5K>vt*3tnu0J1Q3k=g&tOCH%f?xr@*JKJ84jxyCSHJ$N-$Jt6D zS^StgT>Jjp`RuQ z0k6(mQA4j%MAFgcAca!fs;&^CzLExN%l6Y78&;H@SXBj<0@Oh{p*aa} z8l+&KE1BEO%hx@;|L3Wu1MQ1{`e0YcIauw0QO{XKu!cjg4C)MAp)MgKumpiX051`i z&_bA3McHG-0LoyBOYm_T2KoiHNHaviLyG`strPU2GO+%d|CC0OsNQ9JLiZE_C$C6g z*_SA%eCxp0ZE0f1stkZeom)2y(KoU2 z$|BVwtp)7``z1Rmhm@-q?HWbTf>c6M;E`-$eSwc=DIa}9`+|kTDj`%Eh1rJKkMWE* z_io)b65bJ9gvWDMfO1I#Mf|XzR^l(@#qk7s2u(|}8N!nYFqYH%iWw7MW9mf3Am|)x>-~xGOaIACU-qMkzCw7GCE)69m=~0 zH>y#$pfKBB((*7>63vd^hxQkME`lgaKa7OhWMf1lx!6<>hiTX)LnF6{V$37LcNiCS zX4Rlw-w)6V>mjj!6=K{8Y3ZA}#51kqwE7ZY-JN?U()i|?-Rtr%Ml72n1T|{LJP~yMx)>%=sMD*3v1|+i0HsSC?iW1H=@ei8v&IClEIeB zR7o}sCtFL>JNEcdjZDVGFNFcMN-C_2bqC{b2 zqbD|Hkwlpb`S}00Z*uGAk*RkcYy){hrf2V}L{obZ!NM~$e9ItFByc>?50wn@LgDdS zlyL@fB)@X-07GHmNnpcJRGh4K=&2$*6LewV#3THm40)||5oiyx%xM92QqZA(c>neG zeN=6FoAm7GoyKBeA)(fkn?rq6neBP>j+z?a1p~a=? z4Vi{HQsp91KnHMka29+nKlp1!(qL;)X)x(R7kHEiHfTN6w24F?a2_Ciw(?{jx?UF$ zJ;Y~C6hJh9gI4EeW(U9lN8dDXy0S;#=h0MK<~YvFe9p)I;@+t=IiJlOCb(Mgpe(U< z$pL}MtkagHB{dzXodo#yWdQhtcFDSsE^9efRs;2i%?Cgn<&OA=SVJy)NKH$KlG8>W zralW(8jRAcl-5*G9l@YpD>~@RHs1MzeN!V_(!_i|lLKU77V$vaG>)=mfv5|rg0rdU z|ClIfKsFFAU0I8&^F1g=pjyDj$gT+7K&35I(Zi>K9RxgWNfbq$X8}+`lwXqY3(ekY zj3#mvdY1}Xl#}_KUw-d5_e{M_PvzL~`LHNKD;OdD7~{og)nKZ6YD5d3PGni9#eg-8 zFvU9ssId}h;uYdw!uM6~4T*|{X;7dAh5*G1twg9I0J#;Kgc}2V)5O7o%y7{w97n$u z|M21GrzTuTH*}JDIRE-PNS_7JHS&`$)v`g*Z~}N*d677%6^DVQMzCZfmay>3;adfg zolXUY(`!;mqd~8G2qJVMU5exnZHeX%XQUK+8bU+OO3YbuUqSm+181?&L?WP- zmGlpqF1-o8&%PPX8M;7!rR?^dx%|*6nK{=nx1e1fg4yLUF1F;Gk zQXZgSI6?SW#qc=XE`Zu+rwT(1HGr=`!{-c9eQY*iduDQ+1^-|H!kt;HHDG_?@T6!$ zn5s?HhrCBmeEOF8mSx^Jlcb1Zm+g~$s(*g}-do+| z$lEp!`QhMu)PApBNWH1JmzX>;3WC586_dx&_A38DvH=}D)7SKsLV3c3bGMl zlF1*E1mO-n$WjEiL{OzTgpoF^V}(+%R2Fg=vy8Gbq95G9-_+jtgVQ?}mG_KpOmhHz zV6+TT;UClnPheGS6Xr{nev}H%O3q>I1jG}J8Zwsw1CfH;O^Adk^5BUD9Rf2XVXat0;7P!FZv&hgd z&%R}@KfH8g0{w{{$Nh)A*vcf>4C~PFJe*7p7SP4?g0?_pi%fH{7#jwNnjK6Yl|e(n zr0a#;YpGsB>sts02 z%|-r@OZW$`woCrzjNz?AH_-AGSq5`ds0UIli{=7Q0ZQptm=KD$3Ov(3lp3JVzhmn( z2t$nn2d!or<H(GMdB@-3SN4kzF9XvPKfuXAyA(CExUU@bYUWB=f} z>})I>ADbMRZv;-a-};*e=Fa`&KioYWJVM9P(6aGnv(qb3+|(1PiA|A7dM2INjEg6;2lL^hF$oiO#NfyhLMc6dLW3iNnx%1CNH&9P=ES^&VBl1w z2xG%kQz2*)q$KY*fHP>bYk@~hCcrdX-ne!(>K@C^+sqjeB>5Nx1elD;+y*qSU7yV? zKJemfpg%uJ+YkNizy`@dV-&ID@-IaQ!(7Fw8@B`+Ip}`{E4s|G5SK>H@Y841^nE z^X8DrQJ%Bs3AO7PbHb5kiM>pX0w};<+ zZ0`?okmw#pU_g*{H9$wzgU4#{n3@*NW{^PR% z{MsRMT$dz3wn5<+yseR)MmSfVvD8dvvT>hhGVo*G&nambOza$a#cUgEpG+lHLY{-t zg=zN?RO~@oHY~yNB0wbZ;20IJL}8L-q|_+jU!<~Gb7s4--#wO`_zd~EamEaqTTr?3 z;X&B#pRK%iIBtwT007R#JQK3+610+bfRTk#hcKblM7B`qA6QfjYw|b~e+IS4Y&|kE zV|t#euf(##U&`-sRC(IO)C(D(-}b>TqPiHa(-W~3Qu!;?8o-QmOxwxlaQZR%C6Cb* zrp9Jolj&kV+%CLe5c}cwkqhqY7IL`N7k1h6+Tr$<3%larV(Ud+ZgX+^#rMvAXWzwL zb#dpyO9tnBr2WfF?(aT!q@BF9OZC@|wC}lWaOg+c=P&DeFn2D!eCRtrynOIGN80VH zhaP?Mn!ysL+r4Xg|1p;uO0C~BPkQaSEo0&4^O&`a&QQ*7?bGebD;_^*HY+pS^I{%v zjlhdwy}YS_M1cO|8p?Lj+Flp@bo-gLgEdaK@Be5A4X;hNzyHxL_#Z83uU^-M$i?5U z>$Z=J+dp>C?9;e7^UCgNTzvh?ZoyovzG~>s>sNJaRHZ?OdP-&)Tqk(ZUlC?sgwqIQyWV9d7^1cOU0sYv_jI(`(r$+8J-v zC|=wVh6JTOXR{q$z~CMC1t$dx1ivLG^V>~%=vyJ}3P!i&I?ac9nDO~7D%{b;YYNy( z%mL}sFn?@y`f?xBv&e+W(IcE+%G-gwE66Akqn?!h?t&YN$ph$}Wj9P^QE>~-;-<+9 zW=?bZ#`cNWB`+5jq;4@>d_Q$Z!NpY5B_bE6-_%k4H_y&p6~Tx}mgkfG0TPBHumQY* z7x>2ra3(^~X*4aS69c>a+7YCrVsXr4H7o`ph>gL>hIarEQ3`Jo&H{U2jK=5*zby+w zjCS57pp!QK44g^mTY>=9xqW?i!5yEw|C@Q4txWHkJ)SquZm-(dr2`lLu<^z2j%c46 z`9^oKw!LoC(8ZFQ2NyTC-wx=E2 zd`kC+L+xqfgYO+~|9JeD7Ey%%rkx(YyZgwIcGuRy1E$*#PIP1UH*@h}<1xDDRO#y>lP?#4X*$(FN@XU;0A(?5(HG-aWdr{exS( zmOp#fk+QG#?-PVzTqlel@KQVaXp?1};b)e0i z*MDv3&Yhp^=*7{)ZSkoC-H#q_|M#b!ox8ZJH{LGVx%8x&8sl_N;^S)PAgsgf{~W&9 zzU!H}@BYH42LT^$4}E&*JK-}!7sq{e=wk0@hr(L(>m48CNB`y5hweOf`_S)P^0}|g z{pde^ZYcUEKR*<~`Cl0No!5phKK~nojXB&dy<_Ni{``)?{vB>_{msGCjzP1X)2e*$?epaWEbO+_Ngyj*Dkv2(z!pZxohq#?a{l2e&+7GhkizX zdFbMm;fveap$B~6p22dCw10HZU=NS9TfZ{&v43~(;Lwk>-@bR~N8^1%zjOTkLl@87 zKlJFe4-7r+|2{Bu=b;A&+cw>P29KU@H$QrD z-o#Vd7a#q2w`bGslE;QV@{PwXZ5Qp{Fn9O*-Gi!|ZjXO_D1xURANrk(pBTD$XSnc_^T&}zSDbZD2j8wI@p8h_D{Y#bZ6}8!6{6)XYCofb7;@d?~Lpn z`kmvS>7Mr1g7(>Gx*z3Y?Y^Olqx-tz=gx!shrYA?*{9B$soS@*VB`gO270_DfM8@h z7qo9Z`$H{@WjRKQwN8>bMcEq7jL}S?Gq2U@9Tq=EpC7H8{Oe>=k;%NXv@WKd~=Y; z8DP8K{+4L}@}(ELs73q5-|ikTi?oM+=ghgg-~XM#nwGcQf45^~Z!K>Z|K1?Jwe7** K`@$1vFaH0bo6+O| delta 11263 zcmZXad6Zqnedi@4%R$BnOhO`gK}@`3q`Fmg@2%?-O+Z2*WW*xG8ponmsiof3{j^TT zPh@e%#*R%2frNw%v~~oR5XL5Pyan4~Vi<57FTuo|`1oY^i7F@b$7lxYv<0{pLy$rZ=5k>#s&QOkN@V}`vG;)8)q!~)X(3{w`QIHH#6pa zWZs46|INuw=6(6XdGDGzE4TArICrj`asGwpT{>5u-1N@5{hz5hcW=7;<#Q(2+q#mMZy1+1 zs@_ejZr*m==5-sF-SVO9R^NE*E#ueN>*`gvUcL2dv-+ydH?Q8&OIz1nUu_-Pv@))` z*?nkubb0TlO}Cg^Cf2VR*|B`&&ahct+ia0xe7wE=+HG5xEIIdz-uCf0xp;Ie#4BXI zs9q$#J8{K*kLO>U|E~P`cZdapZ!Ep{_~y|t%+Ncxt-EgNt#_`x_J*OGhHqN4A>G8b2J7?_L*uPL zpOw7vnK!)Q?#X|7_nCEEIk|b+j+Cxhv2we+*{+@#nW*E62~&-1U3rVzxM6Fv>axw_ z6Sr+ycKguv@%rxO8?M=UlUg}yHaIh)?res3+`4Y#=xDWCT)k%5@+)tYH%(l3$Kq1m z*H-O{QnW?#yZM6o@5|qO+goOu{KL0hkuQDw1C|N~t3)HCj?}EvjgoC>YNM(;v`$zT zMT}B(J~{1l?R67E3{fRzD&eatwMi=3q)ypJn$)yy9knz@cgnEcH$3|41#?QX&bZ*z zg|B{l-n~03Ge-s&>!2I!gVVn8sgvHRI!c|Q>#9nL+NbpV%mdHQK6;c6zG~I-MI&Kp zzWJ_Q`CsnJ`5yaF7VeR9{Hm*k4OQcGTX&V{glI)0ni#sKGpfO-?)=}k z?9B_e?#s_^eK-$q+n?XE{l5If_6PE+9lP>B?AUYap8vLO_Q{>&GiUz7so!3(Z|14l zJAZ9vUUB!X{L{M!Frb8``?{{G*}V^%qiTKIwsbUI-H0GVY9$BRG>PL6&X;rVqUzdO z(fEO$uW9M3($v)}e$ffvcE;6G`NlK@H1&tMC zR~glo6AY#k%Fz(PF=MVaZK6GW6|0b{x^7G`ZKGn_T3MT9gKw0tI%d?yM0*H^p|VX% zf(h2f+B(qHe9LJarD|Mo?_wj(V9EFVZvP8q$-vgo=(@>kM<;uBc=*i9&;9*<`SIU> zDi8gSr}KM0{&fB+f2Kb1bhh_AoiF+1)A<$t?ETa;`NMy3*0rj$;q9i1 zqIB(>zjgA=w&Ua~JAP)xQ-640{`Gu+ekDJUf9t+S^SgH)&EMzG%Rl<~TLve~?<@*q zBZD?yo-cdgQ29}IyBFq9?4HW?p8fgdJxB6A4<61R+p7z{73iaryiZkYp162+yhhj^9K%Qckp<= z_|U=pr-zQ^&4-`JmmPULzj|bU{@Br}TpgRrKRR|Of8w!&xjlX$|K#}o{PD-9vVLMJ z|M-c6`IDdP<=H2yyyV1hln;DU-hE^8+XM=Os^0<-g-kJ~fs9>r)5wKR$IR z@A>@kyz1$L`R7lc$WMM@f4=>TQ+d`iQ~8N!4&@L3(ZPJ~A0NtJ_~QfFe`$X{_fHPw z&;Q9(zU#|V`AuIrn7{ay6?yhoe=`q#^SmH*G9dC8ye&p-L| zL;2osPvu{Gek%X%^M~{OFC5BO{jY=b2Bc+@4pD1RInRFalX>@x59K8<9ms$G(yyOJ zo%eocLw@i(`|}llF_r)EFOKGY-#waF{pErDfB$kSANbx>zTx}F^Q<2n&QJc}SPnmY zG@t)hCkAJE!^^*t$6kIizwbxK_lN)?@NW%*^P703pemU39p*bu5N)m_U+nP}Qh zK?Bw=QzjpoD z*v830-(SVrQixqE;b|zR>1xMfOl*@#AZaa=i;V?4lTQ|OYtaiWaD}L_(n6@z4(SkD znAK~5mU9FE3NkAnt4_zNpHyL8C{mc(3VtUhCALtF{oMj{vb^Z|!bu>j#aPF&ll+fsp+1uF%OCFv?e88w%5SBv)1NGfC5HT|LL zR?0f^?$WbD>dxs55P#;$4+gi&wX|T>7zocq zX&SHVU|B57H8gSMYS7gOPAYWN7WM>jAs{PTUvwOQcde4Hr8^woC~cwzO3!PZV1cd* zmF2xlkGfdO_J5u|?uR$`Cwm<0+4FQY+NY_T-~&pLqpW=G9a745!Fz{v)e3p4E#z1U z9ixK~AQmPD9^mwo419DE2h0&FukIuw${To*Ig~Y2nrP21@iz0>Kg5*cGmKF*d#y=sm%7l!7ftMczT%qrK^) zj3)7VAs9_X%kXh!Wgv(V2Ibilyzm`Bg!WO<7TN1<%_%0YX;Re>UF8{H_!ML)w2XkI z$vZ>k(8jJ}7b)?65o80>Dio*kb!#e65Y<{%HcLO|C$^9G#?BsOnSh{73JC59aeE9} z5N#9^pO)$(Pl_~9uHW(IMuu{rs^wp&QCwO@jEJpMYz2jLP6n(WrbE=up?Vc3i3`w( zg;-Hs4?XzMaU#wJjA5{Y2{`BBkz--qggs5;Hk)8yB!naQM1rbM-h}~W@%9DjPB@aTQ!==4xFZTT~`K{F5}70+ML7r5~bDk%0iXE3nR2(t?%X zCI$)&vC0MN;f!Q9E!2dWnIj01H2)FqFh!|c%L+1^4-d+(JF zJ`oATNR??Gmcw@1ihA)5C}`V62nJM#78LBvi2-ySONYli?;a$46zW#=MN(bE@J5Ig zDH)WL75(4fktt*oK-C7aWsl_~E%>16YIRho7JxQWBzOblsDOfT&R`b4 zLR8GXX4Rgq#&<>^olwXK(-&B3z$5x1Z7V3Y=}-y*Ml=#iZ-K+gfi;XS9x?*R4T{0w zGTEE+41{NP%d)<5@!>SRqy&|~FAh@_41CN-=*FbVVwPmXKw|qr^}eU?`OsFQ4Rkct zDQ4FzFvB_KF{Ft2kN_2!OEZE`oFa@1C}O|qZh;Zl(=YY2FAQq{OZ{ z3?&jXAf%v*7Q_KH5MG6R6a5Jc^7Ar`jgGZ$!IFl4rYmU;m|Y+&1q#8@7{Qs)FDcSs z$uocJ%46$$y>WTA>1=8g2N^WY1%7D=1>{K>aG|P%9BUemO9#~yg(dl!(*n(5K&H+? zqRfGWP?2IB9|y^hG}xFbD!>_OSv8_h$q86w)AD5pkzz`%>^dZ)FZsg@GiJUpHCWel zAxptq&{TvoYz`7-?`S!=7%b6>;e{K5E?u|O9vd1Baog!?<%=#K*uMsvros%Q zq3{CiFwxi2MRr-i;&^jV82_i4OrRW6saSNQjBQ20<5Mw!1o%U|8lLa;D~mU$5c zKdCIl*Te*%SmH49CPk)HsXCBgvCSfH86yK(lM95dPiqpJ(yT7Adn(o#^0;=OEgt>i z;j!ta!a5+CfJ#1z46x;p@Y&>A9RXT{h%OGMs^CMkjFg0JNaz|2_23wSt?3vnKmZ_ zMaOw~B_ZLFdydG{uEfxGj591W-7%@SRr$~e_ zw2TYFHx-M4$f|;rHMs5?S0pJ=1`TxRTKsR9Oppi(@C3AF28w}zsoKHUr~%LEB9#Wh z;;u`NkDvEi6Ox~j50-%>Jr*b{6sfJD1VlZWlL0`_qH@qIfv%y+6+V+z#AB)&GfJ+D zrG%L1EqV@FqlIQZ3n$_?U{Fv?b|vgi2sJzbxf0rd-2=snh9Fex7o$-+?Uz=c*t9uL zY@h5+5RIKZRC=SUG<4^w6MR-xP=%oj91@ZitZF=BIX?2pWCehoNDOTk00V##3qZpV zQA=BsP<0SKI)_;>4cv#c?PDe)WSJl`c$7Rk0bXD%Sk~(1G+4a#ua0ioJmk+Viseg- z9Amfin}uaV$Ei}i4i`u7U?9ooiPT8mX?8>d8XAEoQHAWE^sE&Eb}*?gD$)XMN`qFk zEW|UWgmRp#C0`?n#{9F+y4Yyetx%MrEd}fS{P79cc6exX+9E}2>LjKS6IK<=#U6Q^ z$S?r5oQ7BMj4B)J$N*SUpKJgT$V|f#fx*F?A&?A?B*32B@Sv7rXn_X-7b3C?j*{>J zyZCR+jIS~F95VrgDvJO4+rrU_I6i!~THF>vb%+O=ylo_1fD}$Om`Y^9K=Mg7+mif< zcSBwSD|l6%Dx4$IL-VuZ7)THRw86Y8Rlt!E^{!2fC#oG-rSROR;HWYEj4D0Iw$kY% zT(R)TWVF+3;+TmijOv>r7)l)EitqrsFidTtYz=1=0Fx59U@$mcKDy@aL-5W}=-^g^ zUE_LzXNb!S_?Rrf<4CyW2&C4gj1+t&1 zavcrJ`B*^|&RU`Tx+Xb--f+2^T%ThE-f>12Zqa}OF&okb+9XNqWB)l=>>5~wZDIuI z)s`K0+|5X4f|jmJxe#7=y#Lf`cvy>>t^DAMAUvFd`JFb#afR#-I-zC^K{3EVm8{!7j~(i@)apB+guCEyv$s8Q+^ zpQ0vA144#k)6j@FAxHDy|C}2h{Cf;|D3@m=( z$mWS@tmlf1R^(oc+?KvUOfcn8GDpX)6Z7y_J6p zEx8qoFkms!8yC?fV`Y#j2<{(Uhhi$48+q0^OWdy%mwU+01lYD%B?uNbNLa|}a!$an zB~j&IYogf*W`HEjRKTqg8*nzK=kT0uhqsusr>F3SfOMZRgZ^m~)DZC#0ZB>6ORmYB z@ae=}#r`u$z$~*!MxDrDTanOqyrvL4I}@NRZh<(+NkN1|&Fd1BjT)9?zyg#y6H1+vu!F-ThwVbL43e!1Q&90V|+=m|FX zi$kV09Cr#4;NZ@;cE}@c7)T0vXau>Yc^QpB zP7a+d6fY|lod*>Nf+#;1HF#Q@vqD0fK!AlXRD3L+UE;HemmA6QN>)!+-Fa$i39_Jg z=n833%m6PYzu`UrL&iM~t;Mx&5r>Qk&N`yCN_tU_VK92XdhpcNv5AdwVr_4IQC-tm ziodbE1D{NqLsKP6)^IDqN4tV8ttJ%5QRCBSWz-1S3{E$3V}jC;eF0k4f>@E;005bT zVJ#qdY3UBYDeO}~72$x%rB^Y8SV72w3nXvlAp70%>7zRam!)T}WKjGPtf4W9!LStN zatgc*MfxFE$^#nZ84k2}pZ4R$Km^VQaY$xA5M+QC!3{`Mx)W>9qay$>vmnYnngpzh z!oh=+jm&ryTPRcE`x^00(0s}4@Qti^w?u$ z2+JpkmpC>AYgyf!&ij%d8yTN(dqZvr4YqwTI&8x7)W(^!&F5Y@cygcvtl@55v_QEs z!-!ZM?*&)@;s#m`pe}lb&LX41d;#HQvMpkWupyx>AY%%H21Dml#uD|{j);Pc8+M>m zfMDtm!ctJ07<{3HC}*Ee!9j}w)UMukB26yl8fj!`GEO%jI-N`c{f^iyQ6*}Qx8+Oj zxJVIk)m)^}mq0sVa0zkX0CKu=nU5VH+vW$v!o?nuP!PvDay4T8q*9-pzjPobif06n z+eN-2TmS*Z!!SHJL55VS`Qsg57#f`%A3XK)pO@&!II#!(8aD=5NCX(9%W0xZ84*L) zULrsOy~Q0E_n76*0%a6h6jFf!t&+rTCiDn5p*#`=$F=Yjd2vm)qPX=+ zL?=bWV>1Yr9ho5aDRb%mfkmJHfjqkWm&nX%SF6q|xO;j=Bgskh$dL$aU`evUEYTxv8D1_EMc ze#63&zm!v*^UkME8-dpyY1UT{f&(7@L$oDgFEGlNaE2g|2ocRo7DJ0!9)l^j9X0lL8VYC zXgO|m7z`djh|T+X8P7qus$8jbsO5lshc5s?46e3?$Oe>u{&V^GiUosmk&W`m5>F36 z)#xp5Teu%4=0eHB8$7awQ=v7u2IHY1uH2l(*%gDq^8?7%z^Kq#FecicxPrTVlTL+Dr0Buicw3UAZ?uyYj)DK6E@U zxbETn_3Nhc$f`&3#n&In-@N`np19!;e(}r|#^Tq?^StoJNAhzw9?Dy9I+)+Ndj07q yQa-tQNq%Yd;k@(aseIX*sr=14.17'} + hasBin: true + + undici-types@7.18.2: + resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==} + +snapshots: + + '@types/node@25.5.0': + dependencies: + undici-types: 7.18.2 + + typescript@6.0.2: {} + + undici-types@7.18.2: {} diff --git a/pkgs/test/pnpm/pnpm_11/src/tsconfig.json b/pkgs/test/pnpm/pnpm_11/src/tsconfig.json new file mode 100644 index 000000000000..3471bd329666 --- /dev/null +++ b/pkgs/test/pnpm/pnpm_11/src/tsconfig.json @@ -0,0 +1,13 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "NodeNext", + "moduleResolution": "NodeNext", + "outDir": "dist", + "rootDir": ".", + "strict": true, + "esModuleInterop": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true + } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0133a2683d37..f864001a47cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3141,8 +3141,9 @@ with pkgs; pnpm_9 pnpm_10_29_2 pnpm_10 + pnpm_11 ; - pnpm = pnpm_10; + pnpm = pnpm_11; inherit (callPackages ../build-support/node/fetch-pnpm-deps { }) fetchPnpmDeps From 574e3c6cefa79da2f659ab82bb37494aee8eab74 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Mon, 11 May 2026 14:25:51 -0700 Subject: [PATCH 0296/1079] dablin: remove unused pcre dependency --- pkgs/by-name/da/dablin/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/da/dablin/package.nix b/pkgs/by-name/da/dablin/package.nix index 644c13ee5b0c..bddcbf70b9bc 100644 --- a/pkgs/by-name/da/dablin/package.nix +++ b/pkgs/by-name/da/dablin/package.nix @@ -8,7 +8,6 @@ SDL2, gtkmm3, faad2, - pcre, }: stdenv.mkDerivation (finalAttrs: { @@ -32,7 +31,6 @@ stdenv.mkDerivation (finalAttrs: { mpg123 SDL2 gtkmm3 - pcre ]; meta = { From be142c424fc089bc9c5e71d2e5f55938d6c6564b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 21:27:25 +0000 Subject: [PATCH 0297/1079] honeycomb-refinery: 3.2.0 -> 3.2.1 --- pkgs/by-name/ho/honeycomb-refinery/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix index 61a61079036d..20482c4f51bd 100644 --- a/pkgs/by-name/ho/honeycomb-refinery/package.nix +++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "honeycomb-refinery"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "honeycombio"; repo = "refinery"; rev = "v${finalAttrs.version}"; - hash = "sha256-8UzFoIxi9Vvf5/67rFsED/XTOz1pGeyxyuvLlTO7mVc="; + hash = "sha256-2avpxXlphqCNLeuTwskZKML/Dp5igm/qexq44lk8ne8="; }; env.NO_REDIS_TEST = true; @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { "-X main.BuildID=${finalAttrs.version}" ]; - vendorHash = "sha256-nzz4SdJnISM6/yCgwelg2w7wlPBInQU1YizT5Ds2z5Y="; + vendorHash = "sha256-PBNL6oL3X+zaom2vbPJ0WuH9syZqWw4WXWbUqu/mtH0="; doCheck = true; From b85b42abfddc6cfe66961d6cb6a34ea19324a10a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 21:30:13 +0000 Subject: [PATCH 0298/1079] coroot: 1.19.7 -> 1.20.2 --- pkgs/by-name/co/coroot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index df3f4af94c53..aa3966a12955 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "coroot"; - version = "1.19.7"; + version = "1.20.2"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${finalAttrs.version}"; - hash = "sha256-eMN0n+kXN49o7oCjWAa3kPDAEksvGroRLrfFEVdPORE="; + hash = "sha256-c+O0nV9b1hSKP+/atJpUihr8ZkMNCwIok4Ldmm+ivmA="; }; - vendorHash = "sha256-DCdrE8UYkuUN+rUuxVSGbAnAeLivZ2Xp8xjM+56ZF+A="; + vendorHash = "sha256-npMQah59pJqF6wgD2dlEleneIZbP/atDGEpjjb+KCpI="; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/front"; hash = "sha256-5N4dmtKdZgwulqxFHYKhnHOYAg0gnb/rzVVcmzjYFUg="; From 5ee8e884ff5abec93ef9b4aa1755c5c70e5e149d Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Mon, 11 May 2026 14:39:33 -0700 Subject: [PATCH 0299/1079] ddnet: remove unused pcre dependency --- pkgs/by-name/dd/ddnet/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index ff19ad0993ee..d28885b64238 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -15,7 +15,6 @@ libogg, libx11, opusfile, - pcre, python3, SDL2, sqlite, @@ -62,7 +61,6 @@ stdenv.mkDerivation rec { buildInputs = [ curl libnotify - pcre python3 sqlite ] From c3f22fcacdc343fda12feb9b279bce8a4b6960aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 21:47:50 +0000 Subject: [PATCH 0300/1079] age-plugin-sss: 0.3.1 -> 0.4.0 --- pkgs/by-name/ag/age-plugin-sss/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ag/age-plugin-sss/package.nix b/pkgs/by-name/ag/age-plugin-sss/package.nix index 07e727428cfe..d354830d4038 100644 --- a/pkgs/by-name/ag/age-plugin-sss/package.nix +++ b/pkgs/by-name/ag/age-plugin-sss/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "age-plugin-sss"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "olastor"; repo = "age-plugin-sss"; tag = "v${finalAttrs.version}"; - hash = "sha256-QNu2Sp0CxYYXuMzf7X0mMYI677ICu5emOM4F9HlKhHA="; + hash = "sha256-XXlnot+oevRJKl0F1uz2DHg3yrtGhlBSlEGOsx/hCMw="; }; vendorHash = "sha256-Aw7dwro6adluhQXPlZ9RZVGBAmNw539Z3c+a8TmPTXU="; From f0209b8c0522c491e92867b9f383ca7c74aee88b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 21:48:07 +0000 Subject: [PATCH 0301/1079] age-plugin-fido2-hmac: 0.4.0 -> 0.5.0 --- 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 c0511da63160..92bf96e18a4b 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 (finalAttrs: { pname = "age-plugin-fido2-hmac"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "olastor"; repo = "age-plugin-fido2-hmac"; tag = "v${finalAttrs.version}"; - hash = "sha256-8DO62uISwleJB/NFH7U8xhfT5bcda+d+7U6LXvySsD0="; + hash = "sha256-3lhGGw7QI1aij6IU7AeoxwgcVsCNKyrmsKBockb0kRw="; }; - vendorHash = "sha256-3r/eTaa4kYRXqq7sUZzzGkgcF8lZbPZguoHb6W6t1T0="; + vendorHash = "sha256-kHv5epwaiBE69rcblICofGoVULuLQT1h0sK4jWwtX9w="; ldflags = [ "-s" From d1e3252a28a0ed6e6ba74928a27ac9e5715609c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 22:19:59 +0000 Subject: [PATCH 0302/1079] scraper: 0.26.0 -> 0.27.0 --- pkgs/by-name/sc/scraper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix index c9d77ae81f19..330d9316f9ed 100644 --- a/pkgs/by-name/sc/scraper/package.nix +++ b/pkgs/by-name/sc/scraper/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "scraper"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "rust-scraper"; repo = "scraper"; tag = "v${finalAttrs.version}"; - hash = "sha256-gdxE9vkN9y5KCmPF0IzSodgxKyWTzYHuLrIMFu4To1E="; + hash = "sha256-6gCoF+Uafw0WISuksBh4kwF7TL6N73Y8CpkcKe8Nyqw="; }; - cargoHash = "sha256-xpg5/ZZEUVNLHGJsbpb/m9TRUJS6wb2HOIoPt407+q0="; + cargoHash = "sha256-Mse6pO9VXturMxMpPe3zaNTsvRpADdns1zu/pX4mfgE="; nativeBuildInputs = [ installShellFiles ]; From a50b490aba87f870dddbb30ae09e866c3a55f5bb Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Mon, 11 May 2026 15:21:38 -0700 Subject: [PATCH 0303/1079] dico: use pcre2 --- pkgs/by-name/di/dico/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/dico/package.nix b/pkgs/by-name/di/dico/package.nix index 0c39ca041d66..6032f5892120 100644 --- a/pkgs/by-name/di/dico/package.nix +++ b/pkgs/by-name/di/dico/package.nix @@ -9,7 +9,7 @@ gsasl, guile, python3, - pcre, + pcre2, libffi, groff, libxcrypt, @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { gsasl guile python3 - pcre + pcre2 libffi libxcrypt ]; From 7482fdacb1b2520e5248e572a22778edca359bdc Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 12 May 2026 00:37:19 +0200 Subject: [PATCH 0304/1079] iina: 1.4.1 -> 1.4.2 --- pkgs/by-name/ii/iina/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index 25c002a44172..51a280835fbc 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "iina"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "https://github.com/iina/iina/releases/download/v${finalAttrs.version}/IINA.v${finalAttrs.version}.dmg"; - hash = "sha256-F3rUaeoSm+2VqCrFm1+1jQoGw1NC/KejfbohSogh+Eg="; + hash = "sha256-Lg/Yn7uhySpsEVFx5bUZBIg7tJf75ROmlh0ID7qwj/Y="; }; nativeBuildInputs = [ undmg ]; From 8ede43870e54212c3bcef77f4bef37d72319165a Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sun, 10 May 2026 01:30:09 +0200 Subject: [PATCH 0305/1079] qbz: 1.2.10 -> 1.2.12 Signed-off-by: Felix Singer --- pkgs/by-name/qb/qbz/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/qb/qbz/package.nix b/pkgs/by-name/qb/qbz/package.nix index 0673a979afe8..4ec68643b5ba 100644 --- a/pkgs/by-name/qb/qbz/package.nix +++ b/pkgs/by-name/qb/qbz/package.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "qbz"; - version = "1.2.10"; + version = "1.2.12"; src = fetchFromGitHub { owner = "vicrodh"; repo = "qbz"; tag = "v${finalAttrs.version}"; - hash = "sha256-cPe7J0KtcTQFfjhNL9giRPLx2VwHsUYRDV/ZM/2dFas="; + hash = "sha256-SuEmBxwwEkINmH/cswV9Ed6FtBKP6IRrjQ7sIYMPOTg="; }; - cargoHash = "sha256-tmXcLNu8ejYTP13b+Ir1ExtRrsEXsUcULUgIX9gzltU="; + cargoHash = "sha256-bOm2W7lQag87dDRqcCCFPp2c+qVuOAoLpPH7Pihz1BU="; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { npmDeps = fetchNpmDeps { name = "qbz-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; - hash = "sha256-MYBxnLGSz4MyrpdNKUIBtnA6HFimPwrcEOYOGSbS5AY="; + hash = "sha256-WjZg3xaJFOdCA0XaIFwWhd4kglUjkWei6Cw3+NiP6zs="; }; env.LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; From 5f7ff1085a591a499981c06474f24908ae6d5d85 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Sun, 3 May 2026 00:44:51 -0400 Subject: [PATCH 0306/1079] gcc: pass result of lib.systems.equals around rather than recomputing --- pkgs/development/compilers/gcc/all.nix | 26 ++++------ .../compilers/gcc/common/builder.nix | 3 +- .../compilers/gcc/common/checksum.nix | 11 ++--- .../compilers/gcc/common/configure-flags.nix | 19 +++---- .../compilers/gcc/common/dependencies.nix | 8 +-- .../gcc/common/extra-target-flags.nix | 9 ++-- .../compilers/gcc/common/libgcc.nix | 24 ++++----- .../compilers/gcc/common/pre-configure.nix | 25 ++++------ pkgs/development/compilers/gcc/default.nix | 49 +++++++++++-------- .../compilers/gcc/patches/default.nix | 7 ++- 10 files changed, 80 insertions(+), 101 deletions(-) diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index 26fa34c03c30..6445bee64264 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -13,6 +13,9 @@ let versions = import ./versions.nix; + buildIsHost = lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform; + buildIsTarget = lib.systems.equals stdenv.buildPlatform stdenv.targetPlatform; + hostIsTarget = lib.systems.equals stdenv.hostPlatform stdenv.targetPlatform; gccForMajorMinorVersion = majorMinorVersion: let @@ -24,18 +27,13 @@ let callPackage ./default.nix { inherit noSysDirs; inherit majorMinorVersion; + _systemInfo = { + inherit buildIsHost hostIsTarget; + }; reproducibleBuild = true; profiledCompiler = false; - libcCross = - if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then - targetPackages.libc or pkgs.libc - else - null; - threadsCross = - if !lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform then - targetPackages.threads or pkgs.threads - else - { }; + libcCross = if !buildIsTarget then targetPackages.libc or pkgs.libc else null; + threadsCross = if !buildIsTarget then targetPackages.threads or pkgs.threads else { }; isl = if stdenv.hostPlatform.isDarwin then null else isl_0_20; # do not allow version skew when cross-building gcc # @@ -56,13 +54,7 @@ let # Let's fix both problems by requiring the same compiler version for # cross-case. stdenv = - if - ( - (!lib.systems.equals stdenv.targetPlatform stdenv.buildPlatform) - || (!lib.systems.equals stdenv.hostPlatform stdenv.targetPlatform) - ) - && stdenv.cc.isGNU - then + if (!buildIsTarget || !hostIsTarget) && stdenv.cc.isGNU then overrideCC stdenv buildPackages."gcc${majorVersion}" else stdenv; diff --git a/pkgs/development/compilers/gcc/common/builder.nix b/pkgs/development/compilers/gcc/common/builder.nix index edd28a26ce95..e1e8a96ea8a3 100644 --- a/pkgs/development/compilers/gcc/common/builder.nix +++ b/pkgs/development/compilers/gcc/common/builder.nix @@ -3,11 +3,12 @@ stdenv, enableMultilib, targetConfig, + hostIsTarget, }: let forceLibgccToBuildCrtStuff = import ./libgcc-buildstuff.nix { inherit lib stdenv; }; - isCross = !lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform; + isCross = !hostIsTarget; in # We don't support multilib and cross at the same time diff --git a/pkgs/development/compilers/gcc/common/checksum.nix b/pkgs/development/compilers/gcc/common/checksum.nix index a283d281c9ed..45c5e4340305 100644 --- a/pkgs/development/compilers/gcc/common/checksum.nix +++ b/pkgs/development/compilers/gcc/common/checksum.nix @@ -5,17 +5,12 @@ langC, langCC, runtimeShell, + buildIsHost, + hostIsTarget, }: let - enableChecksum = - ( - with stdenv; - lib.systems.equals buildPlatform hostPlatform && lib.systems.equals hostPlatform targetPlatform - ) - && langC - && langCC - && !stdenv.hostPlatform.isDarwin; + enableChecksum = buildIsHost && hostIsTarget && langC && langCC && !stdenv.hostPlatform.isDarwin; in ( pkg: diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index e2c735c0751f..66099c229743 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -32,7 +32,8 @@ langObjCpp, langJit, langRust ? false, - disableBootstrap ? (!lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform), + hostIsTarget, + disableBootstrap ? (!hostIsTarget), }: assert !enablePlugin -> disableGdbPlugin; @@ -48,7 +49,6 @@ assert !enablePlugin -> disableGdbPlugin; let inherit (stdenv) - buildPlatform hostPlatform targetPlatform ; @@ -56,9 +56,8 @@ let # See https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903 disableBootstrap' = disableBootstrap && !langFortran && !langGo; - crossMingw = (!lib.systems.equals targetPlatform hostPlatform) && targetPlatform.isMinGW; - crossDarwin = - (!lib.systems.equals targetPlatform hostPlatform) && targetPlatform.libc == "libSystem"; + crossMingw = !hostIsTarget && targetPlatform.isMinGW; + crossDarwin = !hostIsTarget && targetPlatform.libc == "libSystem"; crossConfigureFlags = # Ensure that -print-prog-name is able to find the correct programs. @@ -247,20 +246,18 @@ let ++ lib.optional (isl != null) "--with-isl=${isl}" # Ada options, gcc can't build the runtime library for a cross compiler - ++ lib.optional langAda ( - if lib.systems.equals hostPlatform targetPlatform then "--enable-libada" else "--disable-libada" - ) + ++ lib.optional langAda (if hostIsTarget then "--enable-libada" else "--disable-libada") ++ import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; } - ++ lib.optionals (!lib.systems.equals targetPlatform hostPlatform) crossConfigureFlags + ++ lib.optionals (!hostIsTarget) crossConfigureFlags ++ lib.optional disableBootstrap' "--disable-bootstrap" # Platform-specific flags ++ lib.optional ( - lib.systems.equals targetPlatform hostPlatform && targetPlatform.isx86_32 + hostIsTarget && targetPlatform.isx86_32 ) "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" ++ lib.optional (targetPlatform.isNetBSD || targetPlatform.isCygwin) "--disable-libssp" # Provided by libc. ++ lib.optionals hostPlatform.isSunOS [ @@ -277,7 +274,7 @@ let lib.optional (targetPlatform.libc == "musl") # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865 "--disable-libmpx" - ++ lib.optionals (lib.systems.equals targetPlatform hostPlatform && targetPlatform.libc == "musl") [ + ++ lib.optionals (hostIsTarget && targetPlatform.libc == "musl") [ "--disable-libsanitizer" "--disable-symvers" "libat_cv_have_ifunc=no" diff --git a/pkgs/development/compilers/gcc/common/dependencies.nix b/pkgs/development/compilers/gcc/common/dependencies.nix index c9e85c0d99fb..9d8feadde99e 100644 --- a/pkgs/development/compilers/gcc/common/dependencies.nix +++ b/pkgs/development/compilers/gcc/common/dependencies.nix @@ -27,11 +27,13 @@ cargo, withoutTargetLibc ? null, threadsCross ? null, + buildIsHost, + hostIsTarget, }: let inherit (lib) optionals; - inherit (stdenv) buildPlatform hostPlatform targetPlatform; + inherit (stdenv) buildPlatform targetPlatform; in { @@ -56,12 +58,12 @@ in # same for all gcc's depsBuildTarget = ( - if lib.systems.equals hostPlatform buildPlatform then + if buildIsHost then [ targetPackages.stdenv.cc.bintools # newly-built gcc will be used ] else - assert lib.systems.equals targetPlatform hostPlatform; + assert hostIsTarget; [ # build != host == target stdenv.cc diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix index 437a015dbf7b..fa078b87ff67 100644 --- a/pkgs/development/compilers/gcc/common/extra-target-flags.nix +++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -4,12 +4,9 @@ withoutTargetLibc, libcCross, threadsCross, + hostIsTarget, }: -let - inherit (stdenv) hostPlatform targetPlatform; -in - { # For non-cross builds these flags are currently assigned in builder.sh. # It would be good to consolidate the generation of makeFlags @@ -18,7 +15,7 @@ in let mkFlags = dep: - lib.optionals ((!lib.systems.equals targetPlatform hostPlatform) && dep != null) ( + lib.optionals (!hostIsTarget && dep != null) ( [ "-O2 -idirafter ${lib.getDev dep}${dep.incdir or "/include"}" ] @@ -35,7 +32,7 @@ in let mkFlags = dep: - lib.optionals ((!lib.systems.equals targetPlatform hostPlatform) && dep != null) ( + lib.optionals (!hostIsTarget && dep != null) ( [ "-Wl,-L${lib.getLib dep}${dep.libdir or "/lib"}" ] diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index c9f6a7793344..d937775d54f0 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -10,6 +10,7 @@ hostPlatform, withoutTargetLibc, libcCross, + hostIsTarget, }: assert !stdenv.targetPlatform.hasSharedLibraries -> !enableShared; @@ -24,27 +25,20 @@ lib.pipe drv pkg: pkg.overrideAttrs ( previousAttrs: - lib.optionalAttrs - ( - (!lib.systems.equals targetPlatform hostPlatform) - && (enableShared || targetPlatform.isMinGW) - && withoutTargetLibc - ) - { - makeFlags = [ - "all-gcc" - "all-target-libgcc" - ]; - installTargets = "install-gcc install-target-libgcc"; - } + lib.optionalAttrs (!hostIsTarget && (enableShared || targetPlatform.isMinGW) && withoutTargetLibc) { + makeFlags = [ + "all-gcc" + "all-target-libgcc" + ]; + installTargets = "install-gcc install-target-libgcc"; + } ) ) ] ++ ( let - targetPlatformSlash = - if lib.systems.equals hostPlatform targetPlatform then "" else "${targetPlatform.config}/"; + targetPlatformSlash = if hostIsTarget then "" else "${targetPlatform.config}/"; # If we are building a cross-compiler and the target libc provided # to us at build time has a libgcc, use that instead of building a diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 806cbfc5b115..39c9d73fa232 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -14,6 +14,8 @@ enableShared, enableMultilib, pkgsBuildTarget, + buildIsHost, + hostIsTarget, }: assert langAda -> gnat-bootstrap != null; @@ -39,7 +41,7 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' langFortran && ( - (!lib.systems.equals buildPlatform hostPlatform) && (lib.systems.equals hostPlatform targetPlatform) + !buildIsHost && hostIsTarget ) ) '' @@ -57,12 +59,9 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' # HACK: if host and target config are the same, but the platforms are # actually different we need to convince the configure script that it # is in fact building a cross compiler although it doesn't believe it. -+ - lib.optionalString - (targetPlatform.config == hostPlatform.config && (!lib.systems.equals targetPlatform hostPlatform)) - '' - substituteInPlace configure --replace is_cross_compiler=no is_cross_compiler=yes - '' ++ lib.optionalString (targetPlatform.config == hostPlatform.config && !hostIsTarget) '' + substituteInPlace configure --replace is_cross_compiler=no is_cross_compiler=yes +'' # Normally (for host != target case) --without-headers automatically # enables 'inhibit_libc=true' in gcc's gcc/configure.ac. But case of @@ -71,11 +70,7 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' # We explicitly inhibit libc headers use in this case as well. + lib.optionalString - ( - (!lib.systems.equals targetPlatform hostPlatform) - && withoutTargetLibc - && targetPlatform.config == hostPlatform.config - ) + (!hostIsTarget && withoutTargetLibc && targetPlatform.config == hostPlatform.config) '' export inhibit_libc=true '' @@ -93,6 +88,6 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' done '' -+ lib.optionalString ( - (!lib.systems.equals targetPlatform hostPlatform) && withoutTargetLibc && enableShared -) (import ./libgcc-buildstuff.nix { inherit lib stdenv; }) ++ lib.optionalString (!hostIsTarget && withoutTargetLibc && enableShared) ( + import ./libgcc-buildstuff.nix { inherit lib stdenv; } +) diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index f7a19a73673b..b7089add88f2 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -35,8 +35,14 @@ zlib ? null, libucontext ? null, gnat-bootstrap ? null, + # Allows only computing system equality once across every file responsible for + # building gcc. Not part of the public API + _systemInfo ? { + buildIsHost = lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform; + hostIsTarget = lib.systems.equals stdenv.hostPlatform stdenv.targetPlatform; + }, enableMultilib ? false, - enablePlugin ? (lib.systems.equals stdenv.hostPlatform stdenv.buildPlatform), # Whether to support user-supplied plug-ins + enablePlugin ? _systemInfo.buildIsHost, # Whether to support user-supplied plug-ins name ? "gcc", libcCross ? null, threadsCross ? { }, # for MinGW @@ -75,6 +81,8 @@ let versions ; + inherit (_systemInfo) buildIsHost hostIsTarget; + gccVersions = import ./versions.nix; version = gccVersions.fromMajorMinor majorMinorVersion; @@ -98,21 +106,16 @@ let disableBootstrap = !stdenv.hostPlatform.isDarwin && !profiledCompiler; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - targetConfig = - if (!lib.systems.equals targetPlatform hostPlatform) then targetPlatform.config else null; + targetConfig = if (!hostIsTarget) then targetPlatform.config else null; patches = callFile ./patches { }; # Cross-gcc settings (build == host != target) - crossMingw = (!lib.systems.equals targetPlatform hostPlatform) && targetPlatform.isMinGW; + crossMingw = (!hostIsTarget) && targetPlatform.isMinGW; stageNameAddon = optionalString withoutTargetLibc "-nolibc"; - crossNameAddon = optionalString ( - !lib.systems.equals targetPlatform hostPlatform - ) "${targetPlatform.config}${stageNameAddon}-"; + crossNameAddon = optionalString (!hostIsTarget) "${targetPlatform.config}${stageNameAddon}-"; - targetPrefix = lib.optionalString ( - !lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform - ) "${stdenv.targetPlatform.config}-"; + targetPrefix = lib.optionalString (!hostIsTarget) "${stdenv.targetPlatform.config}-"; callFile = callPackageWith { # lets @@ -184,6 +187,8 @@ let which zlib ; + + inherit buildIsHost hostIsTarget; }; in @@ -267,7 +272,7 @@ pipe substituteInPlace libgfortran/configure \ --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" '' - + (optionalString ((!lib.systems.equals targetPlatform hostPlatform) || stdenv.cc.libc != null) + + (optionalString ((!hostIsTarget) || stdenv.cc.libc != null) # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. ( @@ -337,11 +342,7 @@ pipe let target = optionalString profiledCompiler "profiled" - + optionalString ( - (lib.systems.equals targetPlatform hostPlatform) - && (lib.systems.equals hostPlatform buildPlatform) - && !disableBootstrap - ) "bootstrap"; + + optionalString (hostIsTarget && buildIsHost && !disableBootstrap) "bootstrap"; in optional (target != "") target; @@ -371,13 +372,11 @@ pipe # compiler (after the specs for the cross-gcc are created). Having # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks. - CPATH = optionals (lib.systems.equals targetPlatform hostPlatform) ( + CPATH = optionals hostIsTarget ( makeSearchPathOutput "dev" "include" ([ ] ++ optional (zlib != null) zlib) ); - LIBRARY_PATH = optionals (lib.systems.equals targetPlatform hostPlatform) ( - makeLibraryPath (optional (zlib != null) zlib) - ); + LIBRARY_PATH = optionals hostIsTarget (makeLibraryPath (optional (zlib != null) zlib)); NIX_LDFLAGS = optionalString hostPlatform.isSunOS "-lm"; @@ -439,10 +438,18 @@ pipe langJit targetPlatform hostPlatform + hostIsTarget withoutTargetLibc enableShared libcCross ; }) - (callPackage ./common/checksum.nix { inherit langC langCC; }) + (callPackage ./common/checksum.nix { + inherit + langC + langCC + buildIsHost + hostIsTarget + ; + }) ] diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 2e412802742e..0c4117bae3db 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -23,6 +23,8 @@ fetchurl, withoutTargetLibc, threadsCross, + buildIsHost, + hostIsTarget, }: let @@ -36,10 +38,7 @@ let # aarch64-darwin, as it breaks building a foreign one: # https://github.com/iains/gcc-12-branch/issues/18 canApplyIainsDarwinPatches = - stdenv.hostPlatform.isDarwin - && stdenv.hostPlatform.isAarch64 - && (lib.systems.equals buildPlatform hostPlatform) - && (lib.systems.equals hostPlatform targetPlatform); + stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && buildIsHost && hostIsTarget; inherit (lib) optionals optional; in From 5c17c2d6ce9797ed7501792677071638f759de49 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Mon, 11 May 2026 13:39:04 -0400 Subject: [PATCH 0307/1079] gcc: remove unused variables --- pkgs/development/compilers/gcc/all.nix | 2 +- pkgs/development/compilers/gcc/default.nix | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index 6445bee64264..e47e31a1b5f2 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -9,7 +9,7 @@ isl_0_20, noSysDirs, wrapCC, -}@args: +}: let versions = import ./versions.nix; diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index b7089add88f2..96e74e4708e4 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -65,9 +65,6 @@ let inherit (lib) callPackageWith - filter - getBin - maintainers makeLibraryPath makeSearchPathOutput mapAttrs @@ -76,8 +73,6 @@ let optionals optionalString pipe - platforms - versionAtLeast versions ; @@ -87,8 +82,6 @@ let version = gccVersions.fromMajorMinor majorMinorVersion; majorVersion = versions.major version; - atLeast14 = versionAtLeast version "14"; - is14 = majorVersion == "14"; is13 = majorVersion == "13"; # releases have a form: MAJOR.MINOR.MICRO, like 14.2.1 From b59d920e2bec7128c0a3daa673f47b174b7ab91e Mon Sep 17 00:00:00 2001 From: euxane Date: Sun, 29 Mar 2026 13:49:13 +0200 Subject: [PATCH 0308/1079] scantpaper: init at 3.0.6 --- pkgs/by-name/sc/scantpaper/package.nix | 115 +++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 pkgs/by-name/sc/scantpaper/package.nix diff --git a/pkgs/by-name/sc/scantpaper/package.nix b/pkgs/by-name/sc/scantpaper/package.nix new file mode 100644 index 000000000000..97b06796cba5 --- /dev/null +++ b/pkgs/by-name/sc/scantpaper/package.nix @@ -0,0 +1,115 @@ +{ + lib, + python3, + fetchFromGitHub, + wrapGAppsHook3, + + # libs + gobject-introspection, + goocanvas_2, + unpaper, + djvulibre, + libtiff, + qpdf, + + # tests + writableTmpDirAsHomeHook, + xvfb, + imagemagickBig, + poppler-utils, + ghostscript, + tesseract, +}: + +let + runtimeExecDeps = [ + unpaper + tesseract + djvulibre + libtiff + qpdf + ]; + +in +python3.pkgs.buildPythonApplication rec { + pname = "scantpaper"; + version = "3.0.6"; + + src = fetchFromGitHub { + owner = "carygravel"; + repo = "scantpaper"; + rev = "v${version}"; + hash = "sha256-MKO5/MIlgjWrL+xUVBe84PgUXUGR0tTxUrJed8LegZc="; + }; + + pyproject = true; + strictDeps = true; + __structuredAttrs = true; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postPatch = '' + # disable formatting check, which breaks on Black version change + substituteInPlace pyproject.toml \ + --replace "--black" "" + ''; + + build-system = with python3.pkgs; [ + setuptools + ]; + + dependencies = + (with python3.pkgs; [ + img2pdf + ocrmypdf + pycairo + pygobject3 + sane + tesserocr + python-iso639 + ]) + ++ [ + goocanvas_2 + ]; + + nativeBuildInputs = [ + wrapGAppsHook3 + gobject-introspection + writableTmpDirAsHomeHook + ]; + + nativeCheckInputs = + (with python3.pkgs; [ + pytestCheckHook + pytest-cov # segfault with pytest-cov-stub + pytest-mock + pytest-xvfb + pytest-timeout + ]) + ++ [ + xvfb + imagemagickBig # "big" version needed for text rendering in tests + poppler-utils + ghostscript + ] + ++ runtimeExecDeps; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath runtimeExecDeps) + ]; + + meta = with lib; { + description = "GUI to produce PDFs or DjVus from scanned documents"; + homepage = "https://github.com/carygravel/scantpaper"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ euxane ]; + platforms = platforms.linux; + mainProgram = "scantpaper"; + }; +} From 7c3cfc2fb00fe83c39558f8e6ed76278a96bd712 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 23:30:14 +0000 Subject: [PATCH 0309/1079] python3Packages.jellyfin-apiclient-python: 1.11.0 -> 1.12.0 --- .../python-modules/jellyfin-apiclient-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix index 475a7f342475..60c7742f8d7f 100644 --- a/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix +++ b/pkgs/development/python-modules/jellyfin-apiclient-python/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "jellyfin-apiclient-python"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-apiclient-python"; tag = "v${version}"; - hash = "sha256-TFF0pENSXWbmIb7IM1bayDACd0VOCTKc1WzLRvTJYNA="; + hash = "sha256-lxwJgYysp/6C/eYviYJu5lfStWulHyl7WxqxMnOE5iw="; }; build-system = [ setuptools ]; From 8e4a6e1b8b11b3c809db563aaa6f8015d7aa70ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 May 2026 23:33:21 +0000 Subject: [PATCH 0310/1079] docker: 29.4.2 -> 29.4.3 --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 02c9f2578f26..cd27e799168a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -438,14 +438,14 @@ in docker_29 = let - version = "29.4.2"; + version = "29.4.3"; in callPackage dockerGen { inherit version; cliRev = "v${version}"; cliHash = "sha256-jGD+Z3koM0a2Te7cq2HdKFizZj39djvTQUmn815Mn4o="; mobyRev = "docker-v${version}"; - mobyHash = "sha256-jPmFYGOxvMof32fQeI4iHLG12ElwysYLSTkIrlluEXM="; + mobyHash = "sha256-YWmxJZwjxh0gwqjHHJDpzZy1K1jS82Twmzb+uWtnejk="; runcRev = "v1.3.5"; runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0="; containerdRev = "v2.2.3"; From d4f0bfbdc57a9b50946dcb55fbbe300bb0e04626 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 7 May 2026 23:25:27 +0000 Subject: [PATCH 0311/1079] {apptainer,singularity}: enable __structuredAttrs --- pkgs/applications/virtualization/singularity/generic.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/singularity/generic.nix b/pkgs/applications/virtualization/singularity/generic.nix index a4d4e5f2271d..7edf7607bfd7 100644 --- a/pkgs/applications/virtualization/singularity/generic.nix +++ b/pkgs/applications/virtualization/singularity/generic.nix @@ -109,6 +109,7 @@ in # go is used to compile extensions when building container images allowGoReference = true; + __structuredAttrs = true; strictDeps = true; passthru = { @@ -206,15 +207,10 @@ in ''; postConfigure = '' - # Code borrowed from pkgs/stdenv/generic/setup.sh configurePhase() - # set to empty if unset : ''${configureFlags=} - # shellcheck disable=SC2086 - $configureScript -V ${version} "''${prefixKey:---prefix=}$prefix" $configureFlags "''${configureFlagsArray[@]}" - - # End of the code from pkgs/stdenv/generic/setup.sh configurPhase() + $configureScript -V ${version} "''${prefixKey:---prefix=}$prefix" "''${configureFlags[@]}" ''; buildPhase = '' From 50162d94bb0990dd386d1ac98862a2ad635cd9ee Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 11 May 2026 23:36:02 +0000 Subject: [PATCH 0312/1079] python3Packages.keras: 3.14.0 -> 3.14.1 Diff: https://github.com/keras-team/keras/compare/v3.14.0...v3.14.1 Changelog: https://github.com/keras-team/keras/releases/tag/v3.14.1 --- pkgs/development/python-modules/keras/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index caec623e5d16..111d658ee05c 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -37,14 +37,15 @@ buildPythonPackage (finalAttrs: { pname = "keras"; - version = "3.14.0"; + version = "3.14.1"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; tag = "v${finalAttrs.version}"; - hash = "sha256-EMwqo+0mIwjDY3wKW4idiAczSSPIGjTRNIYlqPDwd+w="; + hash = "sha256-BaSD21mj7rPV53qFCOxGjGMm+rVzmfCooqcLcvQZa1U="; }; build-system = [ From a3ad76573da2f6e1d262caddf925ff59bff30fe6 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 11 May 2026 23:37:31 +0000 Subject: [PATCH 0313/1079] python3Packages.timm: 1.0.26 -> 1.0.27 Diff: https://github.com/huggingface/pytorch-image-models/compare/v1.0.26...v1.0.27 Changelog: https://github.com/huggingface/pytorch-image-models/blob/v1.0.27/README.md#whats-new --- pkgs/development/python-modules/timm/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index 57d7e19173b2..2f7167e4b287 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -23,14 +23,15 @@ buildPythonPackage (finalAttrs: { pname = "timm"; - version = "1.0.26"; + version = "1.0.27"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "huggingface"; repo = "pytorch-image-models"; tag = "v${finalAttrs.version}"; - hash = "sha256-pbzDoNRRwz41b4X40yBp7oTcJ2e/Y2dKyj9XbEX5c34="; + hash = "sha256-Tur4niy89MyMJ8TD7+zBY6x/tmvtYDkruksf65KdTkE="; }; # Fix torch 2.11.0 compatibility From 073698064101fb7d5d410fe16a1c8633d151eaa8 Mon Sep 17 00:00:00 2001 From: Xiangyan Sun Date: Mon, 11 May 2026 16:40:09 -0700 Subject: [PATCH 0314/1079] gmt: use pcre2 --- pkgs/by-name/gm/gmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gm/gmt/package.nix b/pkgs/by-name/gm/gmt/package.nix index 092f9b7f7b5b..547b97466567 100644 --- a/pkgs/by-name/gm/gmt/package.nix +++ b/pkgs/by-name/gm/gmt/package.nix @@ -7,7 +7,7 @@ apple-sdk, fftwSinglePrec, netcdf, - pcre, + pcre2, gdal, blas, lapack, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { curl gdal netcdf - pcre + pcre2 dcw-gmt gshhg-gmt ] @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "DCW_ROOT" "${dcw-gmt.out}/share/dcw-gmt") (lib.cmakeFeature "GDAL_ROOT" "${gdal.out}") (lib.cmakeFeature "NETCDF_ROOT" "${netcdf.out}") - (lib.cmakeFeature "PCRE_ROOT" "${pcre.out}") + (lib.cmakeFeature "PCRE2_ROOT" "${pcre2.out}") (lib.cmakeBool "GMT_INSTALL_TRADITIONAL_FOLDERNAMES" false) (lib.cmakeBool "GMT_ENABLE_OPENMP" true) (lib.cmakeBool "GMT_INSTALL_MODULE_LINKS" false) From 5b3e6b387d76876c643615c1de1fdbadd4917ef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 00:30:08 +0000 Subject: [PATCH 0315/1079] python3Packages.burner-redis: 0.1.6 -> 0.1.7 --- pkgs/development/python-modules/burner-redis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/burner-redis/default.nix b/pkgs/development/python-modules/burner-redis/default.nix index c8ffe4e2c8dc..3e28ba6bb424 100644 --- a/pkgs/development/python-modules/burner-redis/default.nix +++ b/pkgs/development/python-modules/burner-redis/default.nix @@ -11,19 +11,19 @@ buildPythonPackage (finalAttrs: { pname = "burner-redis"; - version = "0.1.6"; + version = "0.1.7"; pyproject = true; src = fetchFromGitHub { owner = "prefectlabs"; repo = "burner-redis"; tag = "v${finalAttrs.version}"; - hash = "sha256-soXwXxo8vVGEEM5iDNFa86zlPA+e74b+AS9diUoOdME="; + hash = "sha256-Ybi8F0imJKUQiF0Gfy/WGcAqfQSPoT1tAvOXDnI5Z7M="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-0qdmcoRje7OkHnGhO8CaR/g38yL9K8Jc+1KjfW4xPTQ="; + hash = "sha256-laD/FhYxXCOZOvs0e7ad80vUgX4eoHpLQu6dx/glkEM="; }; nativeBuildInputs = [ From a0bafcc23cfe2ed1f13d9947b5e9718b29b73286 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 00:33:07 +0000 Subject: [PATCH 0316/1079] python3Packages.clevercsv: 0.8.4 -> 0.8.5 --- pkgs/development/python-modules/clevercsv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix index 9640dc267b22..4fe573c00257 100644 --- a/pkgs/development/python-modules/clevercsv/default.nix +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "clevercsv"; - version = "0.8.4"; + version = "0.8.5"; pyproject = true; src = fetchFromGitHub { owner = "alan-turing-institute"; repo = "CleverCSV"; tag = "v${version}"; - hash = "sha256-yp102f0WHu9wdVpXBIXn4lP7fi1UOQdA7M11hyVyRyM="; + hash = "sha256-XbRydL/4EzsKKlxtMnuv5HLB0VAThRAjH0IDCfRFFTc="; }; build-system = [ setuptools ]; From adb828860cc59ba8272ae56d5718ffb39832fe1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 00:36:37 +0000 Subject: [PATCH 0317/1079] canfigger: 0.3.1 -> 0.3.2 --- pkgs/by-name/ca/canfigger/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/canfigger/package.nix b/pkgs/by-name/ca/canfigger/package.nix index f7f6ad629a23..331c0783a90a 100644 --- a/pkgs/by-name/ca/canfigger/package.nix +++ b/pkgs/by-name/ca/canfigger/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "canfigger"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "andy5995"; repo = "canfigger"; rev = "v${finalAttrs.version}"; - hash = "sha256-JphvLdBQPOu3a9DNlXTOkQyL0eFLM3FCvGZLPSvbKtA="; + hash = "sha256-vqNfakpouoQGKFCyNsn4Cney0UXVYBMCJhwEhaIGPrI="; }; nativeBuildInputs = [ From a11f70658b85125b03c1b648626b76ddf0d4bedd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 00:44:40 +0000 Subject: [PATCH 0318/1079] kdePackages.klevernotes: 1.3.0 -> 1.3.1 --- pkgs/kde/misc/klevernotes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix index 54b9e46ee44f..51c2718ed61b 100644 --- a/pkgs/kde/misc/klevernotes/default.nix +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -9,11 +9,11 @@ }: mkKdeDerivation rec { pname = "klevernotes"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz"; - hash = "sha256-UK0LwCmAh93TR3/n4IEyTfMKMFhoy7IuVCoI2mk13e0="; + hash = "sha256-34w59TT+vY6pJGW3HgPfNAS8hJzPRPMgC4oPKeUfytQ="; }; extraBuildInputs = [ From 77c07ab1af06a51ea16684cd58280370e644c54a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 01:02:47 +0000 Subject: [PATCH 0319/1079] saga: 9.12.2 -> 9.12.3 --- pkgs/by-name/sa/saga/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index af721759e4e7..163a1b2b9a6d 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "saga"; - version = "9.12.2"; + version = "9.12.3"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz"; - hash = "sha256-1q7/dBhmXSaj0bEGU8EAOJesR2sfnQPVK6DVL9TD3V0="; + hash = "sha256-GLVFk3gaTJ6+AF3Vk201NwzetDI6VTA1Q7sE3KHyqDA="; }; sourceRoot = "saga-${finalAttrs.version}/saga-gis"; From f519cfd8f43082483dbd1e34c1fed237cb315ad0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 01:26:15 +0000 Subject: [PATCH 0320/1079] terraform-providers.launchdarkly_launchdarkly: 2.28.0 -> 2.29.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5119c7def0bf..1b85ee139edb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -833,11 +833,11 @@ "vendorHash": "sha256-SJUlHerlt7Z3g1UJ7QKoCwEYolKL7SZp2O537poje3I=" }, "launchdarkly_launchdarkly": { - "hash": "sha256-sFCms2grd7R52ILnRhVubLSEBTaeryS5WBL6+rcTZ/k=", + "hash": "sha256-DCc+qQdVVDdFiHaDv6jc4MUuWPemk3XEeBEKAbTUi7M=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.28.0", + "rev": "v2.29.0", "spdx": "MPL-2.0", "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM=" }, From 594fb12f742ba652e6d3d2430d18fcf441a8a2a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 01:29:04 +0000 Subject: [PATCH 0321/1079] mtail: 3.2.48 -> 3.2.50 --- pkgs/by-name/mt/mtail/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix index f04976bdfe02..3d1503472b5e 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "mtail"; - version = "3.2.48"; + version = "3.2.50"; src = fetchFromGitHub { owner = "jaqx0r"; repo = "mtail"; rev = "v${finalAttrs.version}"; - hash = "sha256-dZ0fjBpQ1hS1AxuD5A3gSTmimhP6PbiyxGs8XaYdo64="; + hash = "sha256-RdDZgmnA9wDN7uEUGle85jLFRmgBNBaRGTu+MthCsfw="; }; proxyVendor = true; - vendorHash = "sha256-ZZcVtZBG0Erh/NmYbw0aOVCg2AGZeHMFRfRbwNFTCks="; + vendorHash = "sha256-37IbtXK4A8mIWmYR2a9XSgfOAHGpl5BxWGZiJG3okzY="; nativeBuildInputs = [ gotools # goyacc From ce3dc05a4c188e457721d8972b364e11ab71a64e Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Mon, 11 May 2026 20:35:44 -0400 Subject: [PATCH 0322/1079] buildPythonPackage: save a function call --- pkgs/development/interpreters/python/mk-python-derivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 5f4ac7b84645..6746e4b1ec63 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -271,7 +271,7 @@ lib.extendMkDerivation { if (isPythonModule drv) && (isMismatchedPython drv) then throwMismatch attrName drv else drv; in - attrName: inputs: map (checkDrv attrName) inputs; + attrName: map (checkDrv attrName); isBootstrapInstallPackage = isBootstrapInstallPackage' (finalAttrs.pname or null); From b57eb40ea7694d823e3e12b0791090ac0e4256ca Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Mon, 11 May 2026 20:37:46 -0400 Subject: [PATCH 0323/1079] buildPythonPackage: avoid validating python itself --- .../interpreters/python/mk-python-derivation.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 6746e4b1ec63..7155137b1f2f 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -373,16 +373,16 @@ lib.extendMkDerivation { buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath); - propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" ( - propagatedBuildInputs - ++ getFinalPassthru "dependencies" + propagatedBuildInputs = + validatePythonMatches "propagatedBuildInputs" ( + propagatedBuildInputs ++ getFinalPassthru "dependencies" + ) ++ [ # we propagate python even for packages transformed with 'toPythonApplication' # this pollutes the PATH but avoids rebuilds # see https://github.com/NixOS/nixpkgs/issues/170887 for more context python - ] - ); + ]; inherit strictDeps; From 0f027769b28494e49dc08e47a1707b45889038a0 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Mon, 11 May 2026 20:41:53 -0400 Subject: [PATCH 0324/1079] buildPythonPackage: use nullable attr keys instead --- .../python/mk-python-derivation.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 7155137b1f2f..6dd3651bfa30 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -40,7 +40,6 @@ let flip getName hasSuffix - head isBool max optional @@ -48,13 +47,9 @@ let optionals optionalString removePrefix - splitString stringLength ; - getOptionalAttrs = - names: attrs: lib.getAttrs (lib.intersectLists names (lib.attrNames attrs)) attrs; - leftPadName = name: against: let @@ -463,13 +458,11 @@ lib.extendMkDerivation { attrs.${name} == [ ] ) "${lib.getName finalAttrs}: ${name} must be unspecified, null or a non-empty list." attrs.${name} ) - ( - getOptionalAttrs [ - "enabledTestMarks" - "enabledTestPaths" - "enabledTests" - ] attrs - ); + { + ${if attrs ? enabledTestMarks then "enabledTestMarks" else null} = attrs.enabledTestMarks; + ${if attrs ? enabledTestPaths then "enabledTestPaths" else null} = attrs.enabledTestPaths; + ${if attrs ? enabledTests then "enabledTests" else null} = attrs.enabledTests; + }; # This derivation transformation function must be independent to `attrs` # for fixed-point arguments support in the future. From bc3ca125ebebc7ba622faede612b676cca4d3907 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Mon, 11 May 2026 20:47:17 -0400 Subject: [PATCH 0325/1079] python/wrapper: use the python that's already added requiredPythonModules always adds a python element. --- pkgs/development/interpreters/python/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 914e4b354c49..2f901232c1ec 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -23,7 +23,7 @@ let env = let - paths = requiredPythonModules (extraLibs ++ [ python ]) ++ [ + paths = requiredPythonModules extraLibs ++ [ (runCommand "bin" { } '' mkdir -p $out/bin '') From 75429919df44a2b9d036da4f2fca26cf6202a277 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Thu, 30 Apr 2026 09:14:05 -0400 Subject: [PATCH 0326/1079] pkgs/toplevel: avoid elaborating crossSystem if not passed Later on, `if crossSystem0 == null` is performed to avoid a `lib.systems.elaborate` if possible. We'd like to take that chance! --- pkgs/top-level/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 12fdbed08197..42df9d2fc674 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -44,7 +44,7 @@ in localSystem, # The system packages will ultimately be run on. - crossSystem ? localSystem, + crossSystem ? null, # Allow a configuration attribute set to be passed in as an argument. config ? { }, From 036b42583712a35cc5695ad58a392eefb3f94bd7 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Tue, 12 May 2026 05:49:57 +0300 Subject: [PATCH 0327/1079] darwin.xcode: add 26.5 --- pkgs/os-specific/darwin/xcode/default.nix | 2 ++ pkgs/top-level/darwin-packages.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 8052d58a8eb3..c23c0c3acc4a 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -131,6 +131,8 @@ lib.makeExtensible (self: { xcode_26_4_Apple_silicon = requireXcode "26.4_Apple_silicon" "sha256-urkJVqUY6+5z0YiEqCru9M/OneDLAMzdGfOt7i3d1WI="; xcode_26_4_1 = requireXcode "26.4.1_Universal" "sha256-N9QgPKfZV64gJPlr4r/0gPS0yAgJd3a+qlr0YbzMCU4="; xcode_26_4_1_Apple_silicon = requireXcode "26.4.1_Apple_silicon" "sha256-8MtGX97e/2+zvY2Et9Jm9eXqVmyr+U02UqsKmffh9hs="; + xcode_26_5 = requireXcode "26.5_Universal" "sha256-hQ1I7CuVOmkCcVLo1AUV25PJGL33fT3MuWR+DJZ84aQ="; + xcode_26_5_Apple_silicon = requireXcode "26.5_Apple_silicon" "sha256-lavdscO0z4Tyf22vV8QMooOt5yYFwnTi1oe3yA+wTdA="; xcode = self."xcode_${ lib.replaceStrings [ "." ] [ "_" ] ( diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index b508524c4d61..5010f2658c7e 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -164,6 +164,8 @@ makeScopeWithSplicing' { xcode_26_4_Apple_silicon xcode_26_4_1 xcode_26_4_1_Apple_silicon + xcode_26_5 + xcode_26_5_Apple_silicon xcode requireXcode ; From c0d109b8574bff8a5ce80f9450aabb56629aa7a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 03:06:36 +0000 Subject: [PATCH 0328/1079] telegraf: 1.38.3 -> 1.38.4 --- pkgs/by-name/te/telegraf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index 79011e7a8d80..09adb69afd7c 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "telegraf"; - version = "1.38.3"; + version = "1.38.4"; subPackages = [ "cmd/telegraf" ]; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "influxdata"; repo = "telegraf"; rev = "v${finalAttrs.version}"; - hash = "sha256-euWz4v9Xd4mjs0K6q+iU2pmyxybQdjhvsSKiVgC1Qmc="; + hash = "sha256-sd0kZz2R+DusoBH6J2B3DRJmwaWYNWiIJ2QsOq8Y+3g="; }; - vendorHash = "sha256-gCeGFjVRHD5LgFylWUETrCPR8rYO03sGyQVyQYhDHYM="; + vendorHash = "sha256-ZBAeuDF2SgqZx2XeoE3yN8Q6fVj8/zjtU7GogF/Z1Kg="; proxyVendor = true; ldflags = [ From bf72ac7a2aad66eead110eb9b416152864d270be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 03:21:15 +0000 Subject: [PATCH 0329/1079] terraform-providers.lxc_incus: 1.0.2 -> 1.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5119c7def0bf..7ed9b3ca5a6c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -869,13 +869,13 @@ "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8=" }, "lxc_incus": { - "hash": "sha256-apgSFI+NgIGEnYAJifwN5X9eIrrdy7Xti83YGdu2bPU=", + "hash": "sha256-m3xUqIUvowu+SZ7TxXYKjOv0Th/Pah0MXVAdaaSPeCo=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v1.0.2", + "rev": "v1.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6CoEZz7/8PysjolcTsrBKForJkoOQqgERYX8g5PeoMY=" + "vendorHash": "sha256-vTJXA7vHVE/m68gr1nHInGs/2T/4OzwS6T3BAAJ+ATo=" }, "marcofranssen_dexidp": { "hash": "sha256-Aby3FNEA6LgsGM/N10LNu9sCv3f2N8WIrmWoqEqTa8E=", From 07c476ea531f0453258a6412da96592562379621 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 03:21:32 +0000 Subject: [PATCH 0330/1079] synology-drive-client: 4.0.2-17889 -> 4.0.3-17892 --- pkgs/by-name/sy/synology-drive-client/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/synology-drive-client/package.nix b/pkgs/by-name/sy/synology-drive-client/package.nix index c73344e4a66e..dae8f02f5720 100644 --- a/pkgs/by-name/sy/synology-drive-client/package.nix +++ b/pkgs/by-name/sy/synology-drive-client/package.nix @@ -20,7 +20,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.synologydownload.com/download/Utility/SynologyDriveClient"; - version = "4.0.2-17889"; + version = "4.0.3-17892"; buildNumberFn = ver: lib.last (lib.splitString "-" ver); meta = { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server"; @@ -50,7 +50,7 @@ let src = fetchurl { url = "${baseUrl}/${finalAttrs.version}/Ubuntu/Installer/synology-drive-client-${buildNumberFn finalAttrs.version}.x86_64.deb"; - sha256 = "sha256-refsAzqYmKAr107D4HiJViBQE1Qa6QoOECtX+TPjSwU="; + sha256 = "sha256-9q7FpZdNWZY+2DP98aDMe+vWEthpH0kcYsuncM3HjWc="; }; nativeBuildInputs = [ @@ -138,7 +138,7 @@ let src = fetchurl { url = "${baseUrl}/${finalAttrs.version}/Mac/Installer/synology-drive-client-${buildNumberFn finalAttrs.version}.dmg"; - sha256 = "sha256-KAoc31Y2RTHu7RWgC61brtoeFR1c+pNi4Odub2JHrfQ="; + sha256 = "sha256-+ZJA7r0xYhpu614I1mqILCfYN/8YddEwgWglmmpfB+o="; }; nativeBuildInputs = [ From ecfb42134282140d2c34dc245d1df8d5aca535a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 03:26:30 +0000 Subject: [PATCH 0331/1079] vuls: 0.38.6 -> 0.39.0 --- pkgs/by-name/vu/vuls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix index 26326b77d9da..37b71918ab43 100644 --- a/pkgs/by-name/vu/vuls/package.nix +++ b/pkgs/by-name/vu/vuls/package.nix @@ -6,17 +6,17 @@ buildGoModule (finalAttrs: { pname = "vuls"; - version = "0.38.6"; + version = "0.39.0"; src = fetchFromGitHub { owner = "future-architect"; repo = "vuls"; tag = "v${finalAttrs.version}"; - hash = "sha256-DY2woiaA6RisbOmHMoIr3sLn2kEccru58LGtST/iY3E="; + hash = "sha256-pK8bW/1Bq8MCGBRBWt4u6DMFjUitWFbJNr9ekP54X6s="; fetchSubmodules = true; }; - vendorHash = "sha256-s2N6MCcqMfwjW095iwOv8hHcrB6NC6XSkrtdSGWq8bE="; + vendorHash = "sha256-Oc1THgqt7MC+mE5X+4tFZPlVQKWaUD4gdxcD1rMfcAI="; ldflags = [ "-s" From d49d2a76bee5cb53c96b33c6b63671677dd3bc4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 03:28:32 +0000 Subject: [PATCH 0332/1079] libretro.fceumm: 0-unstable-2026-04-20 -> 0-unstable-2026-05-06 --- pkgs/applications/emulators/libretro/cores/fceumm.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix index 43600cf59fca..3abd97a160f1 100644 --- a/pkgs/applications/emulators/libretro/cores/fceumm.nix +++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-05-06"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "448a231618186b2af0bb9d6e37aeca05467e112f"; - hash = "sha256-Kr3DEAk8dsFnUT73pOp5qwkCbcDItQwrRMI8hobrCuI="; + rev = "3a84a6fd0ba20dd4877c06b1d58741172148395f"; + hash = "sha256-4+kEoN0+SWl284n7tIR76aysf0GlLdxELDXfpEK6mi8="; }; meta = { From a5468644af8b3a00f850b979bcc3172572239220 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 03:28:37 +0000 Subject: [PATCH 0333/1079] python3Packages.alexapy: 1.29.21 -> 1.29.22 --- pkgs/development/python-modules/alexapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alexapy/default.nix b/pkgs/development/python-modules/alexapy/default.nix index 1cc560e1cecf..0ba4c70a90bd 100644 --- a/pkgs/development/python-modules/alexapy/default.nix +++ b/pkgs/development/python-modules/alexapy/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "alexapy"; - version = "1.29.21"; + version = "1.29.22"; pyproject = true; src = fetchFromGitLab { owner = "keatontaylor"; repo = "alexapy"; tag = "v${finalAttrs.version}"; - hash = "sha256-8oUgttLAhPSB7uysoObxqu0lYre8Y1qg/8m7NhwPazI="; + hash = "sha256-mWEotNbG4On7EqwPX5bVWr1ZRi4WdzCwJ06NXc/9RL4="; }; pythonRelaxDeps = [ "aiofiles" ]; From e225d305a76eb9aafd0c7a231eb9f9b3ebacee55 Mon Sep 17 00:00:00 2001 From: xeals Date: Sun, 10 May 2026 11:34:59 +1000 Subject: [PATCH 0334/1079] clonehero: 1.0.0.4080 -> 1.1.0.6085 --- pkgs/by-name/cl/clonehero/package.nix | 30 +++++++++++++-------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/cl/clonehero/package.nix b/pkgs/by-name/cl/clonehero/package.nix index 9dcdf42391d4..b5c40213ce42 100644 --- a/pkgs/by-name/cl/clonehero/package.nix +++ b/pkgs/by-name/cl/clonehero/package.nix @@ -24,18 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "clonehero"; - version = "1.0.0.4080"; + version = "1.1.0.6085"; src = fetchurl { - url = "https://github.com/clonehero-game/releases/releases/download/V${finalAttrs.version}/CloneHero-linux.tar.xz"; - hash = "sha256-YWLV+wgQ9RfKRSSWh/x0PMjB6tFA4YpHb9WtYOOgZZI="; + url = "https://github.com/clonehero-game/releases/releases/download/v${finalAttrs.version}-final/Linux.x86_64-Standalone.tar"; + hash = "sha256-xy7/3SDNgKw67ikA7CtRVK2gNrfjqx4cTDeRUkkSBKo="; }; - outputs = [ - "out" - "doc" - ]; - nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ @@ -73,17 +68,20 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 clonehero "$out/bin/clonehero" - install -Dm644 UnityPlayer.so "$out/libexec/clonehero/UnityPlayer.so" + install -Dm755 clonehero "$out/libexec/clonehero/clonehero" + install -Dm644 GameAssembly.so "$out/lib/clonehero/GameAssembly.so" + install -Dm644 UnityPlayer.so "$out/lib/clonehero/UnityPlayer.so" - mkdir -p "$out/share/icons/hicolor/128x128/apps" + mkdir -p "$out/share" cp -r clonehero_Data "$out/share/clonehero" - ln -s "$out/share/clonehero" "$out/bin/clonehero_Data" - ln -s "$out/share/clonehero/Resources/UnityPlayer.png" "$out/share/icons/hicolor/128x128/apps/clonehero.png" install -Dm644 "$desktopItem/share/applications/clonehero.desktop" "$out/share/applications/clonehero.desktop" - mkdir -p "$doc/share/doc/clonehero" - cp -r CLONE_HERO_MANUAL.{pdf,txt} Custom EULA.txt THIRDPARTY.txt "$doc/share/doc/clonehero" + mkdir -p "$out/bin" "$out/share/icons/hicolor/128x128/apps" + ln -s "$out/libexec/clonehero/clonehero" "$out/bin/clonehero" + ln -s "$out/lib/clonehero/GameAssembly.so" "$out/libexec/clonehero/GameAssembly.so" + ln -s "$out/lib/clonehero/UnityPlayer.so" "$out/libexec/clonehero/UnityPlayer.so" + ln -s "$out/share/clonehero" "$out/libexec/clonehero/clonehero_Data" + ln -s "$out/share/clonehero/Resources/UnityPlayer.png" "$out/share/icons/hicolor/128x128/apps/clonehero.png" runHook postInstall ''; @@ -114,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { --add-needed libXrandr.so.2 \ --add-needed libXss.so.1 \ --add-needed libXxf86vm.so.1 \ - "$out/libexec/clonehero/UnityPlayer.so" + "$out/lib/clonehero/UnityPlayer.so" ''; meta = { From 90f30d036c72c63742934d87eb18fbcf7eb8fb02 Mon Sep 17 00:00:00 2001 From: Arthur Azevedo de Amorim Date: Tue, 12 May 2026 00:21:06 -0400 Subject: [PATCH 0335/1079] coqPackages.deriving: 0.2.2 -> 0.2.3 Co-Authored-By: Claude Opus 4.7 (1M context) --- pkgs/development/coq-modules/deriving/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/deriving/default.nix b/pkgs/development/coq-modules/deriving/default.nix index 043005105356..bc8176069916 100644 --- a/pkgs/development/coq-modules/deriving/default.nix +++ b/pkgs/development/coq-modules/deriving/default.nix @@ -26,6 +26,7 @@ mkCoqDerivation { lib.switch [ coq.coq-version ssreflect.version ] [ + (case (range "8.17" "9.1") (range "2.0.0" "2.5.0") "0.2.3") (case (range "8.17" "9.1") (range "2.0.0" "2.5.0") "0.2.2") (case (range "8.17" "9.0") (range "2.0.0" "2.3.0") "0.2.1") (case (range "8.17" "8.20") (range "2.0.0" "2.2.0") "0.2.0") @@ -35,6 +36,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."0.2.3".sha256 = "sha256-LqrSlML5pA84FGY4C/xm1EKSgjDe+NaQCSFg2ggdPHE="; release."0.2.2".sha256 = "sha256-qsbyQ4spg5vVLZkechb2LoBazGjMh7pR9sSS0s7tXxs="; release."0.2.1".sha256 = "sha256-053bNa3rcy0fCs9CQoKPxDLXnKRHzteyClLDURpaZJo="; release."0.2.0".sha256 = "sha256-xPsuEayHstjF0PGFJZJ+5cm0oMUrpoGLXN23op97vjM="; From 1fbb89002ab09ee2277f0c6fd2ce9304b9ac098e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 05:37:42 +0000 Subject: [PATCH 0336/1079] wavelog: 2.4 -> 2.4.2 --- pkgs/by-name/wa/wavelog/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix index 964d42178027..1ddda41c5c86 100644 --- a/pkgs/by-name/wa/wavelog/package.nix +++ b/pkgs/by-name/wa/wavelog/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "wavelog"; - version = "2.4"; + version = "2.4.2"; src = fetchFromGitHub { owner = "wavelog"; repo = "wavelog"; tag = finalAttrs.version; - hash = "sha256-ELCLVZ0CiXcefxDKpE3AODDzDCgnljXY/ooy0U+ut54="; + hash = "sha256-qEGqAPRDXxO33CUfoIG1PjigEDhhCRTAvilrKZ1bvfI="; }; installPhase = '' From c82b4a59fbb2b53a964337b4991b0ee538a5658a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 05:48:26 +0000 Subject: [PATCH 0337/1079] plasma-panel-spacer-extended: 1.15.0 -> 1.16.0 --- pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix index f6c16f5023e5..c4633c65946c 100644 --- a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix +++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "plasma-panel-spacer-extended"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "luisbocanegra"; repo = "plasma-panel-spacer-extended"; tag = "v${finalAttrs.version}"; - hash = "sha256-ivfIlZvr7OOXa/zyrorcUPaaFU6IcS2L3yFiX29jnd4="; + hash = "sha256-HmRCdOpwTs9WOnMkzVeB/YjPO+FjD04VpMp0l7Re2XU="; }; nativeBuildInputs = [ From fc95fc0b7a9eb35ef25c3706290186fa1a18e41d Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 12 May 2026 01:34:41 -0400 Subject: [PATCH 0338/1079] fish: Use buildPackages.python3.withPackages --- pkgs/by-name/fi/fish/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 9ecccf3a9402..874b108f6471 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + buildPackages, coreutils, darwin, glibcLocales, @@ -280,7 +281,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config rustc rustPlatform.cargoSetupHook - (python3.withPackages (ps: [ + (buildPackages.python3.withPackages (ps: [ ps.pexpect ps.sphinx ])) From 3b42c56c435cbbb9162707bc9fe4a53426ccff51 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Tue, 12 May 2026 01:48:26 -0400 Subject: [PATCH 0339/1079] fish: Use native fish for docs building --- pkgs/by-name/fi/fish/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index 874b108f6471..f75774a57b26 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -9,6 +9,7 @@ gnused, gnugrep, gawk, + fish, man-db, ninja, getent, @@ -287,6 +288,13 @@ stdenv.mkDerivation (finalAttrs: { ])) # Avoid warnings when building the manpages about HOME not being writable writableTmpDirAsHomeHook + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # Building the docs ends up wanting to run fish_indent at build + # time, which obviously can't use a cross compiled fish_indent + # from this derivation. Pull in the build platform's fish to + # provide it. + fish ]; buildInputs = [ From 19fea737b814cc27c6a2665d54c680317cf2f9bc Mon Sep 17 00:00:00 2001 From: Harinn Date: Tue, 12 May 2026 13:02:04 +0700 Subject: [PATCH 0340/1079] python3Packages.asf-search: skip tests with missing helper and network access --- pkgs/development/python-modules/asf-search/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 402bb9d11360..734cf435cf11 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -51,6 +51,13 @@ buildPythonPackage rec { tenacity ]; + disabledTestPaths = [ + # requires asf_enumeration, not packaged + "tests/BaselineSearch/test_baseline_search.py" + # requires network + "tests/Pair/test_Pair.py" + ]; + pythonImportsCheck = [ "asf_search" ]; meta = { From 845ea87f82a687c71cb462524aed183044e09041 Mon Sep 17 00:00:00 2001 From: drew Date: Mon, 11 May 2026 13:30:24 +0400 Subject: [PATCH 0341/1079] matcha: init at 0.37.0 Signed-off-by: drew --- pkgs/by-name/ma/matcha/package.nix | 63 ++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/ma/matcha/package.nix diff --git a/pkgs/by-name/ma/matcha/package.nix b/pkgs/by-name/ma/matcha/package.nix new file mode 100644 index 000000000000..061b117603d4 --- /dev/null +++ b/pkgs/by-name/ma/matcha/package.nix @@ -0,0 +1,63 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + pcsclite, + stdenv, + apple-sdk_15, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + __structuredAttrs = true; + + pname = "matcha"; + version = "0.37.0"; + + src = fetchFromGitHub { + owner = "floatpane"; + repo = "matcha"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bvy7og6om+Mqn4J0GrtIx8VQQXUiy8Y7Kueyfj5FWWQ="; + }; + + vendorHash = "sha256-SH7zP5+3R82mMx9vHY8QbPUkLr29pwbIbiV55UUQu+M="; + proxyVendor = true; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + pkg-config + ]; + + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; + + subPackages = [ "." ]; + + env.CGO_ENABLED = 1; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + "-X main.date=1970-01-01T00:00:00Z" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Beautiful and functional email client for the terminal"; + homepage = "https://matcha.email"; + changelog = "https://github.com/floatpane/matcha/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "matcha"; + maintainers = with lib.maintainers; [ andrinoff ]; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + }; +}) From d8051b24753d6d57bc4a6c0bbdd8d527af90ed22 Mon Sep 17 00:00:00 2001 From: drew Date: Mon, 11 May 2026 20:49:28 +0400 Subject: [PATCH 0342/1079] maintainers: add andrinoff Signed-off-by: drew --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7e0c716221da..eb1fc512d43a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1796,6 +1796,12 @@ matrix = "@andrewzah:matrix.abare.party"; keys = [ { fingerprint = "D87B D9DC F11B ACD6 CDB4 0CB2 1373 2FB1 3E61 E0BE"; } ]; }; + andrinoff = { + name = "Drew Smirnoff"; + email = "me@andrinoff.com"; + github = "andrinoff"; + githubId = 175145001; + }; Andy3153 = { name = "Andrei Dobrete"; email = "andy3153@protonmail.com"; From 19d7d720740b32568f33822c9cf4523fec23bcc3 Mon Sep 17 00:00:00 2001 From: eljamm Date: Tue, 12 May 2026 08:31:04 +0200 Subject: [PATCH 0343/1079] jaq: add stable release regex to update script to avoid updating to pre-release versions. For example: https://github.com/NixOS/nixpkgs/pull/518560 --- pkgs/by-name/ja/jaq/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix index 545594988841..9aca0ac88eef 100644 --- a/pkgs/by-name/ja/jaq/package.nix +++ b/pkgs/by-name/ja/jaq/package.nix @@ -28,7 +28,9 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v(\\d+\\.\\d+\\.\\d+)$" ]; + }; tests.simple = runCommand "jaq-test" { From e1cde9c6a4018ad748c2968f587fee228c0cf54c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 06:37:06 +0000 Subject: [PATCH 0344/1079] xwayland-run: 0.0.5 -> 0.0.6 --- pkgs/by-name/xw/xwayland-run/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-run/package.nix b/pkgs/by-name/xw/xwayland-run/package.nix index aeb5c2048efb..b9f6f75514e2 100644 --- a/pkgs/by-name/xw/xwayland-run/package.nix +++ b/pkgs/by-name/xw/xwayland-run/package.nix @@ -31,14 +31,14 @@ let in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "xwayland-run"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "ofourdan"; repo = "xwayland-run"; rev = finalAttrs.version; - hash = "sha256-TVoMbFQ5OIJkTX3/tuwylW+Bdx/gl1omObj0c3JjICM="; + hash = "sha256-zrm8uEy7DduOYPrpHrynZgYwEkZr3pbDsJHdWKOUzY0="; }; pyproject = false; From 0414ba635db3df854dda606981492b7a33b0bc43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 06:45:01 +0000 Subject: [PATCH 0345/1079] python3Packages.jupyterhub: 5.4.5 -> 5.4.6 --- pkgs/development/python-modules/jupyterhub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index b7b9109a7278..bd3939370266 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -51,7 +51,7 @@ buildPythonPackage (finalAttrs: { pname = "jupyterhub"; - version = "5.4.5"; + version = "5.4.6"; pyproject = true; __structuredAttrs = true; @@ -59,7 +59,7 @@ buildPythonPackage (finalAttrs: { owner = "jupyterhub"; repo = "jupyterhub"; tag = finalAttrs.version; - hash = "sha256-MdwH9IAV12GqmWc0tfCUi2NA5sT0BFlwCr20JVRzduU="; + hash = "sha256-ndL5pE332VDlCk16XYUDaXhsg/J8ndGtgDhKct+y26c="; }; npmDeps = fetchNpmDeps { From 74f86d5bfdee5886ae9f8e58576363e9f8881d2c Mon Sep 17 00:00:00 2001 From: Harinn Date: Tue, 12 May 2026 13:46:39 +0700 Subject: [PATCH 0346/1079] python3Packages.aocd: disable test_main_user_ambiguous on python 3.14 --- pkgs/development/python-modules/aocd/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index 888742aafac2..bb1b1a0c4281 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -14,6 +14,7 @@ pytest-socket, pytestCheckHook, python-dateutil, + pythonAtLeast, requests, requests-mock, rich, @@ -63,6 +64,11 @@ buildPythonPackage rec { "tests/" ]; + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # argparse prog detection changed in 3.14 + "test_main_user_ambiguous" + ]; + pythonImportsCheck = [ "aocd" ]; meta = { From dd1b262e8023a6b005f73bea40135f542254ea78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 06:49:06 +0000 Subject: [PATCH 0347/1079] vscode-extensions.discloud.discloud: 2.29.5 -> 2.29.6 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9466541813e6..4c9c2c4e7339 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1346,8 +1346,8 @@ let mktplcRef = { publisher = "discloud"; name = "discloud"; - version = "2.29.5"; - hash = "sha256-oWrGDJHVQ8Gwjrh6vlQPKoFlBx3wxzLbMkH0gDFa5jg="; + version = "2.29.6"; + hash = "sha256-CHpRetKZnGzShIePnbVUdR06/1AAO2I1RX7NiZ7GBNs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog"; From 0e25019d277e6510b1dd2c2cb845fc0109e5df0b Mon Sep 17 00:00:00 2001 From: Harinn Date: Tue, 12 May 2026 13:50:00 +0700 Subject: [PATCH 0348/1079] python3Packages.amazon-ion: disable broken benchmark spec tests --- pkgs/development/python-modules/amazon-ion/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 7ad129f4ec1e..596108794f5f 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -95,6 +95,9 @@ buildPythonPackage rec { disabledTests = [ # ValueError: Exceeds the limit (4300) for integer string conversion "test_roundtrips" + # benchmark multi-top-level cbor/json fixtures mismatch upstream + "multiple_top_level_object_cbor" + "multiple_top_level_object_json" ]; disabledTestPaths = [ From c09576359e0844d8382f420727da5877661b418e Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 12 May 2026 07:40:16 +0100 Subject: [PATCH 0349/1079] nono: 0.43.1 -> 0.53.0 Diff: https://github.com/always-further/nono/compare/v0.43.1...v0.53.0 Changelog: https://github.com/always-further/nono/blob/refs/tags/v0.53.0/CHANGELOG.md --- pkgs/by-name/no/nono/package.nix | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/nono/package.nix b/pkgs/by-name/no/nono/package.nix index 7bfc52646cc8..6a67b02ce381 100644 --- a/pkgs/by-name/no/nono/package.nix +++ b/pkgs/by-name/no/nono/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nono"; - version = "0.43.1"; + version = "0.53.0"; __darwinAllowLocalNetworking = true; # required for tests @@ -21,9 +21,9 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "always-further"; repo = "nono"; tag = "v${finalAttrs.version}"; - hash = "sha256-a9RwEbe0x49EyBSGX0mBk2GNeWmc6NhanExqbDyTM40="; + hash = "sha256-jK3/NDNQkeeCKP2iMIJMCq9lrDZ9ksiEnHhFmrz+gew="; }; - cargoHash = "sha256-/+CfiWbg3anUbzgGigFxWs0+KavGEa2odo5kBF9c7Wg="; + cargoHash = "sha256-OK2vlXYFdjMHqzVR6ZoRn7WEfAUVATGhk32JLoDED5c="; nativeBuildInputs = [ pkg-config @@ -52,6 +52,27 @@ rustPlatform.buildRustPackage (finalAttrs: { # needs /bin/pwd "--skip=audit_verify_reports_signed_attestation_with_pinned_public_key" "--skip=rollback_signed_session_verifies_from_audit_dir_bundle" + + # nono-cli + # wants a script `cripts/test-list-aliases.sh`, `git`, and `.git` history + "--skip=alias_inventory_script_passes" + # fails to initialize the sandbox under '/build' + "--skip=policy::tests::test_all_groups_no_deny_within_allow_overlap" + # not relevant for us, requires `git` + "--skip=lint_docs_script_passes" + # want to run `git` + "--skip=alias_inventory_rejects_marker_missing_field" + "--skip=alias_inventory_rejects_naked_serde_alias" + "--skip=alias_inventory_rejects_unapproved_deprecated_module_reach_in" + "--skip=lint_docs_accepts_clean_tree" + "--skip=lint_docs_rejects_quoted_override_deny_outside_allowlist" + + # nono-proxy + # fails to prepare TLS bundle inside build sandbox + "--skip=server::tests::test_intercept_lifecycle_end_to_end" + "--skip=server::tests::test_route_diagnostics_summarises_each_route" + "--skip=tls_intercept::bundle::tests::bundle_contains_ephemeral_and_system_roots" + "--skip=tls_intercept::bundle::tests::bundle_file_has_restrictive_permissions" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # panics with "Deny-within-allow overlap on Linux ... Landlock cannot enforce this. ..." From 078fed868c532988b28fe151de159a3b2de3cfda Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 12 May 2026 07:54:38 +0100 Subject: [PATCH 0350/1079] nono: shorten test skipping Remove the need to repeat `--skip=` for every test. --- pkgs/by-name/no/nono/package.nix | 119 ++++++++++++++++--------------- 1 file changed, 60 insertions(+), 59 deletions(-) diff --git a/pkgs/by-name/no/nono/package.nix b/pkgs/by-name/no/nono/package.nix index 6a67b02ce381..c4bf330111a5 100644 --- a/pkgs/by-name/no/nono/package.nix +++ b/pkgs/by-name/no/nono/package.nix @@ -37,69 +37,70 @@ rustPlatform.buildRustPackage (finalAttrs: { writableTmpDirAsHomeHook ]; - checkFlags = [ - # fails to initialize the sandbox under '/build' - "--skip=test_all_profiles_signal_mode_resolves" - # panic - "--skip=build_run_profile_patch_adds_override_deny_for_sensitive_file" - "--skip=build_run_profile_patch_merges_read_and_write_to_allow_file" - "--skip=prepare_profile_save_from_patch_updates_existing_user_profile" - "--skip=would_shadow_builtin_allows_update_of_existing_user_override" - "--skip=would_shadow_builtin_flags_known_builtin_names" - "--skip=create_audit_state_creates_session_when_enabled" + checkFlags = map (t: "--skip=${t}") ( + [ + # fails to initialize the sandbox under '/build' + "test_all_profiles_signal_mode_resolves" + # panic + "build_run_profile_patch_adds_override_deny_for_sensitive_file" + "build_run_profile_patch_merges_read_and_write_to_allow_file" + "prepare_profile_save_from_patch_updates_existing_user_profile" + "would_shadow_builtin_allows_update_of_existing_user_override" + "would_shadow_builtin_flags_known_builtin_names" + "create_audit_state_creates_session_when_enabled" - # audit_attestation - # needs /bin/pwd - "--skip=audit_verify_reports_signed_attestation_with_pinned_public_key" - "--skip=rollback_signed_session_verifies_from_audit_dir_bundle" + # audit_attestation + # needs /bin/pwd + "audit_verify_reports_signed_attestation_with_pinned_public_key" + "rollback_signed_session_verifies_from_audit_dir_bundle" - # nono-cli - # wants a script `cripts/test-list-aliases.sh`, `git`, and `.git` history - "--skip=alias_inventory_script_passes" - # fails to initialize the sandbox under '/build' - "--skip=policy::tests::test_all_groups_no_deny_within_allow_overlap" - # not relevant for us, requires `git` - "--skip=lint_docs_script_passes" - # want to run `git` - "--skip=alias_inventory_rejects_marker_missing_field" - "--skip=alias_inventory_rejects_naked_serde_alias" - "--skip=alias_inventory_rejects_unapproved_deprecated_module_reach_in" - "--skip=lint_docs_accepts_clean_tree" - "--skip=lint_docs_rejects_quoted_override_deny_outside_allowlist" + # nono-cli + # wants a script `cripts/test-list-aliases.sh`, `git`, and `.git` history + "alias_inventory_script_passes" + # fails to initialize the sandbox under '/build' + # has also failed due to running on darwin despite testing the linux only + # landlock sandboxing + "policy::tests::test_all_groups_no_deny_within_allow_overlap" + # not relevant for us, requires `git` + "lint_docs_script_passes" + # want to run `git` + "alias_inventory_rejects_marker_missing_field" + "alias_inventory_rejects_naked_serde_alias" + "alias_inventory_rejects_unapproved_deprecated_module_reach_in" + "lint_docs_accepts_clean_tree" + "lint_docs_rejects_quoted_override_deny_outside_allowlist" - # nono-proxy - # fails to prepare TLS bundle inside build sandbox - "--skip=server::tests::test_intercept_lifecycle_end_to_end" - "--skip=server::tests::test_route_diagnostics_summarises_each_route" - "--skip=tls_intercept::bundle::tests::bundle_contains_ephemeral_and_system_roots" - "--skip=tls_intercept::bundle::tests::bundle_file_has_restrictive_permissions" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # panics with "Deny-within-allow overlap on Linux ... Landlock cannot enforce this. ..." - # landlock is linux only - "--skip=policy::tests::test_all_groups_no_deny_within_allow_overlap" - # panics with "exact-path fallback must not recursively cover descendants" - "--skip=capability_ext::tests::test_from_profile_allow_file_falls_back_to_exact_directory_when_present" + # nono-proxy + # fails to prepare TLS bundle inside build sandbox + "server::tests::test_intercept_lifecycle_end_to_end" + "server::tests::test_route_diagnostics_summarises_each_route" + "tls_intercept::bundle::tests::bundle_contains_ephemeral_and_system_roots" + "tls_intercept::bundle::tests::bundle_file_has_restrictive_permissions" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # panics with "exact-path fallback must not recursively cover descendants" + "capability_ext::tests::test_from_profile_allow_file_falls_back_to_exact_directory_when_present" - # env_vars - # don't work inside of the /nix dir - # unsure why home is still under /nix with writableTmpDirAsHomeHook - # Sandbox initialization failed: Refusing to grant '/nix' (source: group:system_read_macos) because it overlaps protected nono state root '/nix/build/nix-/.home/.nono'. - "--skip=allow_net_overrides_profile_external_proxy" - "--skip=cli_flag_overrides_env_var" - "--skip=env_nono_allow_comma_separated" - "--skip=env_nono_block_net" - "--skip=env_nono_block_net_accepts_true" - "--skip=env_nono_network_profile" - "--skip=env_nono_profile" - "--skip=env_nono_upstream_bypass_comma_separated" - "--skip=env_nono_upstream_proxy" - "--skip=legacy_env_nono_net_block_still_works" - "--skip=environment_allow_vars_bare_star" - "--skip=environment_allow_vars_default_allows_all" - "--skip=environment_allow_vars_prefix_patterns" - "--skip=environment_allow_vars_with_profile" - ]; + # env_vars + # don't work inside of the /nix dir + # unsure why home is still under /nix with writableTmpDirAsHomeHook + # Sandbox initialization failed: Refusing to grant '/nix' (source: group:system_read_macos) because it overlaps protected nono state root '/nix/build/nix-/.home/.nono'. + "allow_net_overrides_profile_external_proxy" + "cli_flag_overrides_env_var" + "env_nono_allow_comma_separated" + "env_nono_block_net" + "env_nono_block_net_accepts_true" + "env_nono_network_profile" + "env_nono_profile" + "env_nono_upstream_bypass_comma_separated" + "env_nono_upstream_proxy" + "legacy_env_nono_net_block_still_works" + "environment_allow_vars_bare_star" + "environment_allow_vars_default_allows_all" + "environment_allow_vars_prefix_patterns" + "environment_allow_vars_with_profile" + ] + ); meta = { description = "Secure, kernel-enforced sandbox for AI agents, MCP and LLM workloads"; From 6e906e2668467f6690d901092024554e1e0222b7 Mon Sep 17 00:00:00 2001 From: Viena <169875752+devnchill@users.noreply.github.com> Date: Tue, 12 May 2026 12:17:06 +0530 Subject: [PATCH 0351/1079] maintainers: add viena to global maintainer-list --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab3230b9685a..198e52e8765f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -28711,6 +28711,13 @@ githubId = 123554; name = "Thibaut Smith"; }; + viena = { + name = "Viena"; + email = "theviena96@gmail.com"; + github = "devnchill"; + githubId = 169875752; + keys = [ { fingerprint = "BF79 8CD0 CA25 2106 99E1 ED9E F826 F032 DDDA 5560"; } ]; + }; vieta = { email = "vieta@4d2.org"; github = "yVieta"; From 29314531c4bb0d1ce30443ebd64490ded25280eb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 12 May 2026 08:14:56 +0200 Subject: [PATCH 0352/1079] =?UTF-8?q?ocamlPackages.ca-certs:=201.0.1=20?= =?UTF-8?q?=E2=86=92=201.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ca-certs/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ca-certs/default.nix b/pkgs/development/ocaml-modules/ca-certs/default.nix index 8c741e1931b9..4645f8971396 100644 --- a/pkgs/development/ocaml-modules/ca-certs/default.nix +++ b/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -16,13 +16,11 @@ buildDunePackage (finalAttrs: { pname = "ca-certs"; - version = "1.0.1"; - - minimalOCamlVersion = "4.08"; + version = "1.0.3"; src = fetchurl { url = "https://github.com/mirage/ca-certs/releases/download/v${finalAttrs.version}/ca-certs-${finalAttrs.version}.tbz"; - hash = "sha256-0818j1SLrs7yCNQlh3qBHYmOx9HZxL3qb3hlLHyDYcw="; + hash = "sha256-At/J53cLGCGN8uJRGScR3UTFhYrSRXVpOxRas9fUHCk="; }; propagatedBuildInputs = [ From d3e90001a881f47cce38819aa1443ba0be2f256d Mon Sep 17 00:00:00 2001 From: Lyna Date: Tue, 12 May 2026 08:38:39 +0100 Subject: [PATCH 0353/1079] porxie: 0.2.0 -> 0.3.0 --- pkgs/by-name/po/porxie/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/porxie/package.nix b/pkgs/by-name/po/porxie/package.nix index 4eade1cf6aa3..8a0369e2026e 100644 --- a/pkgs/by-name/po/porxie/package.nix +++ b/pkgs/by-name/po/porxie/package.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "porxie"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromCodeberg { owner = "Blooym"; repo = "porxie"; rev = "v${finalAttrs.version}"; - hash = "sha256-BLlsvzmAQj/N1pmw+ZMBmC48O4SPvvLWDD198ihXR+k="; + hash = "sha256-mClUYDBgOtX0WcCG0rXhgnKFqnvE2UOFH3PABeF+pkI="; }; - cargoHash = "sha256-4gRC7ZXok9oshUCkDBhxtbnxma224smaL4GcCgdCkSc="; + cargoHash = "sha256-SImynSnWJ/tiEoSYuFYQ/JncMeierAioZO2Fnx6FHN4="; buildInputs = [ rust-jemalloc-sys ]; From 670fdf6db990b900bb7584f2f27c70e6c02da3a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 07:53:10 +0000 Subject: [PATCH 0354/1079] terraform-providers.aiven_aiven: 4.55.2 -> 4.56.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 68bccf2ae7e9..2dff01e29c48 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,13 +27,13 @@ "vendorHash": null }, "aiven_aiven": { - "hash": "sha256-0f+ZxjMoPyOL4qatcRVk8jjn9TAZkinUX7eYQ1hv+FQ=", + "hash": "sha256-ni4Y5MRnu6AL491wRD8UoQ4MJmnopumYoq59wGujSUQ=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.55.2", + "rev": "v4.56.0", "spdx": "MIT", - "vendorHash": "sha256-toCbbqzi0h6hUeyKMClUBcWsh8+H00K0IjdkgZ5HmOs=" + "vendorHash": "sha256-vSSgABGm1aHGVPIsNXylpan8E07eOQ/Nc8Lf1N3+P5c=" }, "akamai_akamai": { "hash": "sha256-/+IE06obx4Rxzz3uh5QbeS/FhGlK2qTJJFWGAlDWJaw=", From 5e77c83b0428ac08166f4376b10b87dff2e26867 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 07:54:25 +0000 Subject: [PATCH 0355/1079] terraform-providers.hashicorp_google-beta: 7.30.0 -> 7.31.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 68bccf2ae7e9..f228ab5da339 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -580,13 +580,13 @@ "vendorHash": "sha256-UoS4iIVHhCQ+Zk+SJmsMHJgJBKLMbfMVmtm4MDmzT68=" }, "hashicorp_google-beta": { - "hash": "sha256-ltqZ6nyl/leYsV2pBJVgOtcOYIyfDmDLsZLfHTPOyew=", + "hash": "sha256-/HxUOhDATteiUDIeA8zvGI9xQ5rOWJAhLN9PLHiBFfI=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.30.0", + "rev": "v7.31.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-WMfT/gtjRDACXWDf1w3cUiEUdeFrGAnYvDQcuXiQNkk=" + "vendorHash": "sha256-5PnJ87cGMCwEl7zEwjbzgU5kZO9IC4Ls47HX2SZ2h2w=" }, "hashicorp_helm": { "hash": "sha256-S4Fe65f+gEWWxRMC+/i93dwwe7QigPccx4wiqNBpcL8=", From 3d28f1a5cb18f4dca9c713c3f3c0a8236284eba7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 07:54:25 +0000 Subject: [PATCH 0356/1079] lxgw-neoxihei: 1.300 -> 1.301 --- pkgs/by-name/lx/lxgw-neoxihei/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index 660fac8013e9..6a76a110fc1b 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.300"; + version = "1.301"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-n5b5sYmn3X/Eo4jwwt4G/6N17iVBPucW0KTlP/M+Xcc="; + hash = "sha256-C/M5Dl94L83vB7TzREdx6dBms9aHPQfgdWEyjvtvS00="; }; dontUnpack = true; From 12461a3912e07e5f70100870fd2b7a2034ae4d60 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 12 May 2026 07:45:19 +0000 Subject: [PATCH 0357/1079] nixl: 1.0.1 -> 1.1.0 Diff: https://github.com/ai-dynamo/nixl/compare/v1.0.1...v1.1.0 Changelog: https://github.com/ai-dynamo/nixl/releases/tag/v1.1.0 --- pkgs/by-name/ni/nixl/package.nix | 6 ++++-- pkgs/development/python-modules/nixl/default.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nixl/package.nix b/pkgs/by-name/ni/nixl/package.nix index 9df2e2b9990c..43ffdcef4e1f 100644 --- a/pkgs/by-name/ni/nixl/package.nix +++ b/pkgs/by-name/ni/nixl/package.nix @@ -21,6 +21,7 @@ liburing, numactl, taskflow, + tomlplusplus, ucx, # passthru @@ -35,7 +36,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "nixl"; - version = "1.0.1"; + version = "1.1.0"; __structuredAttrs = true; strictDeps = true; @@ -44,7 +45,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { owner = "ai-dynamo"; repo = "nixl"; tag = "v${finalAttrs.version}"; - hash = "sha256-mDpDqwUwI0baIDDpt9/wgIP3saBWY8yWKgwzHgrzJiU="; + hash = "sha256-lzR+haBtRPUJ9VE1AcPndp3CPtW7KCI3nNPeVIGyR0U="; }; postPatch = @@ -103,6 +104,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { liburing numactl taskflow + tomlplusplus ucx python3Packages.python diff --git a/pkgs/development/python-modules/nixl/default.nix b/pkgs/development/python-modules/nixl/default.nix index 8aa00155a58d..a2fb72e2ea57 100644 --- a/pkgs/development/python-modules/nixl/default.nix +++ b/pkgs/development/python-modules/nixl/default.nix @@ -50,6 +50,7 @@ buildPythonPackage.override { inherit (nixl) stdenv; } (finalAttrs: { pytest pyyaml setuptools + torch types-pyyaml ]; dontUseMesonConfigure = true; From 88782420cda654b630743fee2ce7025dfc5eef45 Mon Sep 17 00:00:00 2001 From: Eva Emmerich Date: Fri, 10 Apr 2026 11:52:50 +0200 Subject: [PATCH 0358/1079] docker: add option to prune all volumes when auto pruning it is not possible to prune all volumes using `docker system prune`, the best that can be done is the removal of anonymous volumes using the `--volumes` flag https://docs.docker.com/reference/cli/docker/system/prune/#description add new option `autoPrune.allVolumes.enable` which runs `docker volume prune --all --force` when the system prune service runs. https://docs.docker.com/reference/cli/docker/volume/prune/ add new test for this feature, and the autoPrune feature --- nixos/modules/virtualisation/docker.nix | 66 +++++++++++++++++++++---- nixos/tests/all-tests.nix | 1 + nixos/tests/docker-autoprune.nix | 57 +++++++++++++++++++++ 3 files changed, 115 insertions(+), 9 deletions(-) create mode 100644 nixos/tests/docker-autoprune.nix diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 099d60423f00..26b9e9cbaf73 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -157,6 +157,14 @@ in Whether to periodically prune Docker resources. If enabled, a systemd timer will run `docker system prune -f` as specified by the `dates` option. + + NOTE: by default this does not prune volumes. Anonymous volumes + can be pruned by passing "--volumes" to [autoPrune.flags](#opt-virtualisation.docker.autoPrune.flags). + + To prune all volumes (not just anonymous ones) [`autoPrune.allVolumes.enable`](#opt-virtualisation.docker.autoPrune.allVolumes.enable) + must be used. + + See [upstream documentation](https://docs.docker.com/reference/cli/docker/system/prune/#description) for further information. ''; }; @@ -206,6 +214,28 @@ in system was powered down. ''; }; + + allVolumes = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to periodically prune all Docker volumes when auto pruning other docker resources + by running {command}`docker volume prune --force --all` + + To prune only anonymous volumes, instead pass `--volumes` to `autoPrune.flags` + ''; + }; + + flags = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--filter=label=